1 files changed, 79 insertions, 79 deletions
diff --git a/java/ssl/jdk1.5/IceSSL/Util.java b/java/ssl/jdk1.5/IceSSL/Util.java
index 7f7d17cb67f..44a680e0327 100644
--- a/java/ssl/jdk1.5/IceSSL/Util.java
+++ b/java/ssl/jdk1.5/IceSSL/Util.java
@@ -14,36 +14,36 @@ public final class Util
     public static ConnectionInfo
     getConnectionInfo(Ice.Connection connection)
     {
-	Ice.ConnectionI con = (Ice.ConnectionI)connection;
-	assert(con != null);
+        Ice.ConnectionI con = (Ice.ConnectionI)connection;
+        assert(con != null);
 
-	//
-	// Lock the connection directly. This is done because the only
-	// thing that prevents the transceiver from being closed during
-	// the duration of the invocation is the connection.
-	//
-	synchronized(con)
-	{
-	    IceInternal.Transceiver transceiver = con.getTransceiver();
-	    if(transceiver == null)
-	    {
-		ConnectionInvalidException ex = new ConnectionInvalidException();
-		ex.reason = "connection closed";
-		throw ex;
-	    }
+        //
+        // Lock the connection directly. This is done because the only
+        // thing that prevents the transceiver from being closed during
+        // the duration of the invocation is the connection.
+        //
+        synchronized(con)
+        {
+            IceInternal.Transceiver transceiver = con.getTransceiver();
+            if(transceiver == null)
+            {
+                ConnectionInvalidException ex = new ConnectionInvalidException();
+                ex.reason = "connection closed";
+                throw ex;
+            }
 
-	    try
-	    {
-		TransceiverI sslTransceiver = (TransceiverI)transceiver;
-		return sslTransceiver.getConnectionInfo();
-	    }
-	    catch(ClassCastException ex)
-	    {
-		ConnectionInvalidException e = new ConnectionInvalidException();
-		e.reason = "not ssl connection";
-		throw e;
-	    }
-	}
+            try
+            {
+                TransceiverI sslTransceiver = (TransceiverI)transceiver;
+                return sslTransceiver.getConnectionInfo();
+            }
+            catch(ClassCastException ex)
+            {
+                ConnectionInvalidException e = new ConnectionInvalidException();
+                e.reason = "not ssl connection";
+                throw e;
+            }
+        }
     }
 
     //
@@ -51,67 +51,67 @@ public final class Util
     //
     public static java.security.cert.X509Certificate
     createCertificate(String certPEM)
-	throws java.security.cert.CertificateException
+        throws java.security.cert.CertificateException
     {
-	final String header = "-----BEGIN CERTIFICATE-----";
-	final String footer = "-----END CERTIFICATE-----";
+        final String header = "-----BEGIN CERTIFICATE-----";
+        final String footer = "-----END CERTIFICATE-----";
 
-	//
-	// The generateCertificate method requires that its input begin
-	// with the PEM header.
-	//
-	int pos = certPEM.indexOf(header);
-	if(pos == -1)
-	{
-	    certPEM = header + "\n" + certPEM;
-	}
-	else if(pos > 0)
-	{
-	    certPEM = certPEM.substring(pos);
-	}
+        //
+        // The generateCertificate method requires that its input begin
+        // with the PEM header.
+        //
+        int pos = certPEM.indexOf(header);
+        if(pos == -1)
+        {
+            certPEM = header + "\n" + certPEM;
+        }
+        else if(pos > 0)
+        {
+            certPEM = certPEM.substring(pos);
+        }
 
-	//
-	// Add the footer if necessary.
-	//
-	if(certPEM.indexOf(footer) == -1)
-	{
-	    certPEM = certPEM + footer;
-	}
+        //
+        // Add the footer if necessary.
+        //
+        if(certPEM.indexOf(footer) == -1)
+        {
+            certPEM = certPEM + footer;
+        }
 
-	byte[] bytes = null;
-	try
-	{
-	    bytes = certPEM.getBytes("UTF8");
-	}
-	catch(java.io.UnsupportedEncodingException ex)
-	{
-	    assert(false);
-	    return null;
-	}
+        byte[] bytes = null;
+        try
+        {
+            bytes = certPEM.getBytes("UTF8");
+        }
+        catch(java.io.UnsupportedEncodingException ex)
+        {
+            assert(false);
+            return null;
+        }
 
-	java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);
-	java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509");
-	return (java.security.cert.X509Certificate)cf.generateCertificate(in);
+        java.io.ByteArrayInputStream in = new java.io.ByteArrayInputStream(bytes);
+        java.security.cert.CertificateFactory cf = java.security.cert.CertificateFactory.getInstance("X.509");
+        return (java.security.cert.X509Certificate)cf.generateCertificate(in);
     }
 
     static ConnectionInfo
     populateConnectionInfo(javax.net.ssl.SSLSession session, java.net.Socket fd, String adapterName, boolean incoming)
     {
-	ConnectionInfo info = new ConnectionInfo();
-	try
-	{
-	    info.certs = session.getPeerCertificates();
-	}
-	catch(javax.net.ssl.SSLPeerUnverifiedException ex)
-	{
-	    // No peer certificates.
-	}
-	info.cipher = session.getCipherSuite();
-	info.localAddr = (java.net.InetSocketAddress)fd.getLocalSocketAddress();
-	info.remoteAddr = (java.net.InetSocketAddress)fd.getRemoteSocketAddress();
-	info.adapterName = adapterName;
-	info.incoming = incoming;
-	return info;
+        ConnectionInfo info = new ConnectionInfo();
+        try
+        {
+            info.certs = session.getPeerCertificates();
+        }
+        catch(javax.net.ssl.SSLPeerUnverifiedException ex)
+        {
+            // No peer certificates.
+        }
+        info.cipher = session.getCipherSuite();
+        info.localAddr = (java.net.InetSocketAddress)fd.getLocalSocketAddress();
+        info.remoteAddr = (java.net.InetSocketAddress)fd.getRemoteSocketAddress();
+        info.adapterName = adapterName;
+        info.incoming = incoming;
+        return info;
     }
 
     public final static String jdkTarget = "1.5";