Changeset 87

Timestamp:

07/29/13 15:53:58 (11 years ago)

Author:

stoda

Message:

 

Location:

branches/objectmqListeners

Files:

• src/main/java/omq/common/broker/Broker.java (modified) (3 diffs)
• src/main/java/omq/common/util/Serializer.java (modified) (3 diffs)
• target/classes/log4j.xml (deleted)

branches/objectmqListeners/src/main/java/omq/common/broker/Broker.java

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -23 +22 @@
 
 import org.apache.log4j.Logger;
-import org.apache.log4j.xml.DOMConfigurator;
 
 import com.rabbitmq.client.Channel;
@@ -49 +47 @@
         public Broker(Properties env) throws Exception {
                 // Load log4j configuration
-                URL log4jResource = Broker.class.getResource("/log4j.xml");
-                DOMConfigurator.configure(log4jResource);
+                // URL log4jResource = Broker.class.getResource("/log4j.xml");
+                // DOMConfigurator.configure(log4jResource);
 
                 remoteObjs = new HashMap<String, RemoteObject>();

branches/objectmqListeners/src/main/java/omq/common/util/Serializer.java

@@ -48 +48 @@
                         try {
                                 String className = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
-                                
+
                                 if (className == null || className.isEmpty()) {
                                         throw new ClassNotFoundException("Class name is null or empty.");
                                 }
-                                
+
                                 serializer = getInstance(className);
                         } catch (Exception ex) {
@@ -62 +62 @@
         }
 
-        public ISerializer getInstance(String type) throws SerializerException {                                
+        public ISerializer getInstance(String type) throws SerializerException {
                 if (KRYO.equals(type)) {
                         if (kryoSerializer == null) {
@@ -79 +79 @@
                         return javaSerializer;
                 }
-                
-                throw new SerializerException("Serializer not found.");
+
+                throw new SerializerException("Serializer '" + type + "' not found");
         }