From ef341e566becb48cb06913cded9098ea627983e1 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 21 Aug 2011 15:32:37 +0000 Subject: QPID-3307: correct a couple style issues, add some basic unit testing for ObjectMessage and the new CLAOIS git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1160002 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/client/util/ClassLoadingAwareObjectInputStream.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'qpid/java/client/src/main') diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java b/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java index e89f0c5643..669a0f1abf 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStream.java @@ -62,7 +62,6 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream return load(classDesc.getName(), cl); } - @Override protected Class resolveProxyClass(String[] interfaces) throws IOException, ClassNotFoundException @@ -112,16 +111,16 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream if (clazz != null) { return clazz; - } else + } + else { return Class.forName(className, false, _ON_FAULT_CLASS_LOADER); } } } - - - static { + static + { _primitives.put("boolean", boolean.class); _primitives.put("byte", byte.class); _primitives.put("char", char.class); @@ -132,5 +131,4 @@ public class ClassLoadingAwareObjectInputStream extends ObjectInputStream _primitives.put("double", double.class); _primitives.put("void", void.class); } - } -- cgit v1.2.1