Author: rgodfrey
Date: Wed Dec 5 19:34:35 2012
New Revision: 1417602
URL: http://svn.apache.org/viewvc?rev=1417602&view=rev
Log:
PROTON-179 : Applied patch from Phil Harvey
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java?rev=1417602&r1=1417601&r2=1417602&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SimpleSslTransportWrapper.java
Wed Dec 5 19:34:35 2012
@@ -21,6 +21,8 @@
package org.apache.qpid.proton.engine.impl.ssl;
import java.nio.ByteBuffer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
@@ -41,6 +43,8 @@ import org.apache.qpid.proton.engine.Tra
*/
public class SimpleSslTransportWrapper implements SslTransportWrapper
{
+ private static final Logger _logger =
Logger.getLogger(SimpleSslTransportWrapper.class.getName());
+
/**
* Our testing has shown that application buffers need to be a bit larger
* than that provided by {@link SSLSession#getApplicationBufferSize()}
otherwise
@@ -130,7 +134,10 @@ public class SimpleSslTransportWrapper i
runDelegatedTasks(result);
updateCipherAndProtocolName(result);
- System.out.println(_sslParams.getMode() + " input " +
resultToString(result));
+ if(_logger.isLoggable(Level.FINEST))
+ {
+ _logger.log(Level.FINEST, _sslParams.getMode() + " input "
+ resultToString(result));
+ }
Status sslResultStatus = result.getStatus();
HandshakeStatus handshakeStatus = result.getHandshakeStatus();
@@ -155,7 +162,7 @@ public class SimpleSslTransportWrapper i
{
if(handshakeStatus != HandshakeStatus.NOT_HANDSHAKING)
{
- System.out.println("WARN unexpectedly produced bytes
for the underlying input when handshaking");
+ _logger.warning("WARN unexpectedly produced bytes for
the underlying input when handshaking");
}
allAcceptedByUnderlyingInput =
_decodedInputHolder.readInto(_underlyingInput);
@@ -308,4 +315,9 @@ public class SimpleSslTransportWrapper i
}
}
+ public static void main(String[] args)
+ {
+ _logger.info("PHDEBUG in main");
+ _logger.info("PHDEBUG in main2");
+ }
}
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java?rev=1417602&r1=1417601&r2=1417602&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
Wed Dec 5 19:34:35 2012
@@ -36,6 +36,8 @@ import java.security.cert.X509Certificat
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
@@ -54,6 +56,8 @@ import org.bouncycastle.openssl.Password
public class SslEngineFacadeFactory
{
+ private static final Logger _logger =
Logger.getLogger(SslEngineFacadeFactory.class.getName());
+
/**
* The protocol name used to create an {@link SSLContext}, taken from
Java's list of
* standard names at
http://docs.oracle.com/javase/6/docs/technotes/guides/security/StandardNames.html
@@ -101,7 +105,10 @@ public class SslEngineFacadeFactory
}
}
- System.out.println(sslConfiguration.getMode() + " Enabled cipher
suites " + Arrays.asList(sslEngine.getEnabledCipherSuites()));
+ if(_logger.isLoggable(Level.FINE))
+ {
+ _logger.log(Level.FINE, sslConfiguration.getMode() + " Enabled
cipher suites " + Arrays.asList(sslEngine.getEnabledCipherSuites()));
+ }
boolean useClientMode = sslConfiguration.getMode() == Mode.CLIENT ?
true : false;
sslEngine.setUseClientMode(useClientMode);
@@ -165,10 +172,11 @@ public class SslEngineFacadeFactory
{
String caCertAlias = "cacert";
- System.out.println("_sslParams.getTrustedCaDb() : "
- + sslConfiguration.getTrustedCaDb());
- Certificate trustedCaCert = (Certificate)
readPemObject(sslConfiguration
- .getTrustedCaDb());
+ if(_logger.isLoggable(Level.FINE))
+ {
+ _logger.log(Level.FINE, "_sslParams.getTrustedCaDb() : " +
sslConfiguration.getTrustedCaDb());
+ }
+ Certificate trustedCaCert = (Certificate)
readPemObject(sslConfiguration.getTrustedCaDb());
keystore.setCertificateEntry(caCertAlias, trustedCaCert);
}
@@ -256,7 +264,7 @@ public class SslEngineFacadeFactory
}
catch(PEMException e)
{
- System.err.println("Unable to read PEM object. Perhaps you need
the unlimited strength libraries in <java-home>/jre/lib/security/ ?");
+ _logger.log(Level.SEVERE, "Unable to read PEM object. Perhaps you
need the unlimited strength libraries in <java-home>/jre/lib/security/ ?", e);
throw new RuntimeException(e);
}
catch (IOException e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
