Changeset 51 for trunk

Timestamp:

06/19/13 16:30:19 (11 years ago)

Author:

stoda

Message:

 

Location:

trunk/src

Files:

• main/java/omq/common/util/OmqConnectionFactory.java (modified) (1 diff)
• test/java/omq/test/calculator/ClientGson.java (deleted)
• test/java/omq/test/calculator/ClientJava.java (deleted)
• test/java/omq/test/calculator/ClientKryo.java (deleted)
• test/java/omq/test/calculator/ClientTest.java (moved) (moved from trunk/src/test/java/omq/test/calculator/ParameterizedClient.java) (1 diff)

trunk/src/main/java/omq/common/util/OmqConnectionFactory.java

@@ -39 +39 @@
                         } catch (Exception e) {
                                 logger.error(e);
-                                long milis = Long.parseLong(env.getProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"));
+                                long milis = 2000;
+                                if (env != null) {
+                                        milis = Long.parseLong(env.getProperty(ParameterQueue.RETRY_TIME_CONNECTION, "2000"));
+                                }
                                 Thread.sleep(milis);
                         }

trunk/src/test/java/omq/test/calculator/ClientTest.java

@@ -18 +18 @@
 
 @RunWith(value = Parameterized.class)
-public class ParameterizedClient {
+public class ClientTest {
 
         private static Calculator remoteCalc;
         private static Calculator remoteCalc2;
 
-        public ParameterizedClient(String type) throws Exception {
+        public ClientTest(String type) throws Exception {
                 Properties env = new Properties();
                 env.setProperty(ParameterQueue.USER_NAME, "guest");