From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java | 55 ++++++++++++++++++++++++++++---------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
index 1786722..0912664 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/TLSConnectionSecurityProvider.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
+import org.opends.messages.Message;
@@ -55,8 +56,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.messages.ExtensionsMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -216,10 +216,10 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- int msgID = MSGID_TLS_SECURITY_PROVIDER_CANNOT_INITIALIZE;
- String message = getMessage(msgID, getExceptionMessage(e));
+ Message message = ERR_TLS_SECURITY_PROVIDER_CANNOT_INITIALIZE.get(
+ getExceptionMessage(e));
throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
- message, msgID, e);
+ message, e);
}
sslEngine = sslContext.createSSLEngine(inetAddress.getHostName(),
@@ -524,7 +524,7 @@
{
// The client connection has been closed. Disconnect and return.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT, false,
- -1);
+ null);
return false;
}
@@ -554,7 +554,7 @@
// The client connection has been closed. Disconnect and
// return.
clientConnection.disconnect(
- DisconnectReason.CLIENT_DISCONNECT, false, -1);
+ DisconnectReason.CLIENT_DISCONNECT, false, null);
return false;
}
}
@@ -594,14 +594,15 @@
// FIXME -- Allow for closing the SSL channel without closing the
// underlying connection.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT,
- false, -1);
+ false, null);
return false;
default:
// This should not have happened.
clientConnection.disconnect(DisconnectReason.SECURITY_PROBLEM,
- false, MSGID_TLS_SECURITY_PROVIDER_UNEXPECTED_UNWRAP_STATUS,
- String.valueOf(unwrapResult.getStatus()));
+ false,
+ ERR_TLS_SECURITY_PROVIDER_UNEXPECTED_UNWRAP_STATUS.get(
+ String.valueOf(unwrapResult.getStatus())));
return false;
}
@@ -626,7 +627,7 @@
// The client connection has been closed. Disconnect and
// return.
clientConnection.disconnect(
- DisconnectReason.CLIENT_DISCONNECT, false, -1);
+ DisconnectReason.CLIENT_DISCONNECT, false, null);
return false;
}
}
@@ -651,7 +652,7 @@
// An error occurred while trying to communicate with the client.
// Disconnect and return.
- clientConnection.disconnect(DisconnectReason.IO_ERROR, false, -1);
+ clientConnection.disconnect(DisconnectReason.IO_ERROR, false, null);
return false;
}
catch (Exception e)
@@ -664,8 +665,8 @@
// An unexpected error occurred while trying to process the data read.
// Disconnect and return.
clientConnection.disconnect(DisconnectReason.SERVER_ERROR, true,
- MSGID_TLS_SECURITY_PROVIDER_READ_ERROR,
- getExceptionMessage(e));
+ ERR_TLS_SECURITY_PROVIDER_READ_ERROR.get(
+ getExceptionMessage(e)));
return false;
}
}
@@ -781,7 +782,7 @@
// The client connection has been closed. Disconnect and
// return.
clientConnection.disconnect(
- DisconnectReason.CLIENT_DISCONNECT, false, -1);
+ DisconnectReason.CLIENT_DISCONNECT, false, null);
return false;
}
}
@@ -803,7 +804,7 @@
// The client connection is already closed, so we don't need to
// worry about it.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT,
- false, -1);
+ false, null);
return false;
}
else if (bytesRead == 0)
@@ -811,7 +812,7 @@
// We didn't get the data that we need. We'll have to disconnect
// to avoid blocking other clients.
clientConnection.disconnect(DisconnectReason.SECURITY_PROBLEM,
- false, MSGID_TLS_SECURITY_PROVIDER_WRITE_NEEDS_UNWRAP);
+ false, ERR_TLS_SECURITY_PROVIDER_WRITE_NEEDS_UNWRAP.get());
return false;
}
else
@@ -847,14 +848,14 @@
// FIXME -- Allow for closing the SSL channel without closing the
// underlying connection.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT,
- false, -1);
+ false, null);
return false;
default:
// This should not have happened.
clientConnection.disconnect(DisconnectReason.SECURITY_PROBLEM,
- false, MSGID_TLS_SECURITY_PROVIDER_UNEXPECTED_WRAP_STATUS,
- String.valueOf(wrapResult.getStatus()));
+ false, ERR_TLS_SECURITY_PROVIDER_UNEXPECTED_WRAP_STATUS.get(
+ String.valueOf(wrapResult.getStatus())));
return false;
}
@@ -881,7 +882,7 @@
// The client connection has been closed. Disconnect and
// return.
clientConnection.disconnect(
- DisconnectReason.CLIENT_DISCONNECT, false, -1);
+ DisconnectReason.CLIENT_DISCONNECT, false, null);
return false;
}
}
@@ -903,7 +904,7 @@
// The client connection is already closed, so we don't need to
// worry about it.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT,
- false, -1);
+ false, null);
return false;
}
else if (bytesRead == 0)
@@ -911,7 +912,7 @@
// We didn't get the data that we need. We'll have to disconnect
// to avoid blocking other clients.
clientConnection.disconnect(DisconnectReason.SECURITY_PROBLEM,
- false, MSGID_TLS_SECURITY_PROVIDER_WRITE_NEEDS_UNWRAP);
+ false, ERR_TLS_SECURITY_PROVIDER_WRITE_NEEDS_UNWRAP.get());
return false;
}
else
@@ -931,7 +932,7 @@
{
// The client connection has been closed.
clientConnection.disconnect(DisconnectReason.CLIENT_DISCONNECT,
- false, -1);
+ false, null);
return false;
}
}
@@ -951,7 +952,7 @@
// An error occurred while trying to communicate with the client.
// Disconnect and return.
- clientConnection.disconnect(DisconnectReason.IO_ERROR, false, -1);
+ clientConnection.disconnect(DisconnectReason.IO_ERROR, false, null);
return false;
}
catch (Exception e)
@@ -964,8 +965,8 @@
// An unexpected error occurred while trying to process the data read.
// Disconnect and return.
clientConnection.disconnect(DisconnectReason.SERVER_ERROR, true,
- MSGID_TLS_SECURITY_PROVIDER_WRITE_ERROR,
- getExceptionMessage(e));
+ ERR_TLS_SECURITY_PROVIDER_WRITE_ERROR.get(
+ getExceptionMessage(e)));
return false;
}
}
--
Gitblit v1.10.0