diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-06-06 13:38:10 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-06-06 13:38:10 +0000 |
| commit | ef88accc99b9e3a37ea2e65972780b33cdecf150 (patch) | |
| tree | 496f74683db07fe9a9f8901db4b71d9ed25f83f1 /java | |
| parent | Updating for 3.1.0 release. (diff) | |
| download | ice-ef88accc99b9e3a37ea2e65972780b33cdecf150.tar.bz2 ice-ef88accc99b9e3a37ea2e65972780b33cdecf150.tar.xz ice-ef88accc99b9e3a37ea2e65972780b33cdecf150.zip | |
minor edits
Diffstat (limited to 'java')
| -rw-r--r-- | java/ssl/jdk1.4/IceSSL/RFC2253.java | 7 | ||||
| -rw-r--r-- | java/ssl/jdk1.5/IceSSL/RFC2253.java | 7 | ||||
| -rw-r--r-- | java/test/IceSSL/configuration/AllTests.java | 12 |
3 files changed, 16 insertions, 10 deletions
diff --git a/java/ssl/jdk1.4/IceSSL/RFC2253.java b/java/ssl/jdk1.4/IceSSL/RFC2253.java index 0b66a93aaa3..f092c5abc31 100644 --- a/java/ssl/jdk1.4/IceSSL/RFC2253.java +++ b/java/ssl/jdk1.4/IceSSL/RFC2253.java @@ -38,13 +38,13 @@ class RFC2253 { String key; String value; - }; + } static private class ParseState { String data; int pos; - }; + } public static java.util.List parse(String data) @@ -217,7 +217,8 @@ class RFC2253 } } } - else if(Character.isUpperCase(state.data.charAt(state.pos)) || Character.isLowerCase(state.data.charAt(state.pos))) + else if(Character.isUpperCase(state.data.charAt(state.pos)) || + Character.isLowerCase(state.data.charAt(state.pos))) { // // The grammar is wrong in this case. It should be ALPHA diff --git a/java/ssl/jdk1.5/IceSSL/RFC2253.java b/java/ssl/jdk1.5/IceSSL/RFC2253.java index 0b66a93aaa3..f092c5abc31 100644 --- a/java/ssl/jdk1.5/IceSSL/RFC2253.java +++ b/java/ssl/jdk1.5/IceSSL/RFC2253.java @@ -38,13 +38,13 @@ class RFC2253 { String key; String value; - }; + } static private class ParseState { String data; int pos; - }; + } public static java.util.List parse(String data) @@ -217,7 +217,8 @@ class RFC2253 } } } - else if(Character.isUpperCase(state.data.charAt(state.pos)) || Character.isLowerCase(state.data.charAt(state.pos))) + else if(Character.isUpperCase(state.data.charAt(state.pos)) || + Character.isLowerCase(state.data.charAt(state.pos))) { // // The grammar is wrong in this case. It should be ALPHA diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/IceSSL/configuration/AllTests.java index 183c601218d..2a9f84a7179 100644 --- a/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/IceSSL/configuration/AllTests.java @@ -984,7 +984,8 @@ public class AllTests } System.out.println("ok"); - System.out.print("Testing IceSSL.TrustOnly... "); + System.out.print("testing IceSSL.TrustOnly... "); + System.out.flush(); { Ice.InitializationData initData = createClientProps(defaultDir, defaultHost, threadPool); initData = createClientProps(defaultDir, defaultHost, threadPool); @@ -1197,7 +1198,8 @@ public class AllTests } System.out.println("ok"); - System.out.print("Testing IceSSL.TrustOnly.Client... "); + System.out.print("testing IceSSL.TrustOnly.Client... "); + System.out.flush(); { Ice.InitializationData initData = createClientProps(defaultDir, defaultHost, threadPool); initData = createClientProps(defaultDir, defaultHost, threadPool); @@ -1256,7 +1258,8 @@ public class AllTests } System.out.println("ok"); - System.out.print("Testing IceSSL.TrustOnly.Server... "); + System.out.print("testing IceSSL.TrustOnly.Server... "); + System.out.flush(); { Ice.InitializationData initData = createClientProps(defaultDir, defaultHost, threadPool); initData = createClientProps(defaultDir, defaultHost, threadPool); @@ -1315,7 +1318,8 @@ public class AllTests } System.out.println("ok"); - System.out.print("Testing IceSSL.TrustOnly.Server.<adapterName>.. "); + System.out.print("testing IceSSL.TrustOnly.Server.<AdapterName>... "); + System.out.flush(); { Ice.InitializationData initData = createClientProps(defaultDir, defaultHost, threadPool); initData = createClientProps(defaultDir, defaultHost, threadPool); |