Changeset 10 for trunk

Timestamp:

05/16/13 13:13:14 (12 years ago)

Author:

stoda

Message:

bug solved: invoke functions without params

Location:

trunk/objectmq/src/omq

Files:

• client/proxy/Proxymq.java (modified) (2 diffs)
• common/util/Serializer.java (modified) (1 diff)
• common/util/Serializers/GsonImp.java (modified) (1 diff)
• server/remote/request/InvocationThread.java (modified) (1 diff)
• server/remote/request/RemoteObject.java (modified) (2 diffs)
• ztest/farm (added)
• ztest/farm/Animal.java (added)
• ztest/farm/Cow.java (added)
• ztest/farm/Farm.java (added)
• ztest/farm/FarmImpl.java (added)
• ztest/farm/FarmTest.java (added)
• ztest/farm/Pig.java (added)

trunk/objectmq/src/omq/client/proxy/Proxymq.java

@@ -9 +9 @@
 import java.util.Map;
 import java.util.Properties;
-import java.util.Vector;
 
 import omq.Remote;
@@ -159 +158 @@
                 String corrId = java.util.UUID.randomUUID().toString();
                 String methodName = method.getName();
-                Vector<Object> args = new Vector<Object>();
-
-                if (arguments != null) {
-                        for (Object o : arguments) {
-                                args.add(o);
-                        }
-                }
 
                 // Since we need to know whether the method is async and if it has to

trunk/objectmq/src/omq/common/util/Serializer.java

@@ -11 +11 @@
  * 
  * @author Sergi Toda <sergi.toda@estudiants.urv.cat>
- * @author Guillermo Guerrero <guillermo.guerrero@estudiants.urv.cat>
  * 
  */

trunk/objectmq/src/omq/common/util/Serializers/GsonImp.java

@@ -36 +36 @@
                 List<Class<?>> types = obj.getParams(method);
 
-                JsonArray jsonArgs = (JsonArray) jsonObj.get("arguments");
+                try {
+                        JsonArray jsonArgs = (JsonArray) jsonObj.get("arguments");
 
-                // TODO: if (jsonArgs.size() == types.size())
-                int length = jsonArgs.size();
-                Object[] arguments = new Object[length];
+                        // TODO: if (jsonArgs.size() == types.size())
+                        int length = jsonArgs.size();
+                        Object[] arguments = new Object[length];
 
-                int i = 0;
-                for (JsonElement element : jsonArgs) {
-                        arguments[i] = gson.fromJson(element, types.get(i));
-                        i++;
+                        int i = 0;
+                        for (JsonElement element : jsonArgs) {
+                                arguments[i] = gson.fromJson(element, types.get(i));
+                                i++;
+                        }
+
+                        return new Request(id, method, arguments);
+                } catch (NullPointerException e) {
+                        return new Request(id, method, null);
                 }
-
-                return new Request(id, method, arguments);
         }
 

trunk/objectmq/src/omq/server/remote/request/InvocationThread.java

@@ -54 +54 @@
                                 killed = true;
                         } catch (Exception e) {
+                                System.out.println("Error a l'Invocation Thread \nException: " + e);
                                 e.printStackTrace();
-                                System.out.println("Error a l'Invocation Thread \nException: " + e);
                         }
 

trunk/objectmq/src/omq/server/remote/request/RemoteObject.java

@@ -126 +126 @@
         }
 
-        public Object invokeMethod(String methodName,Object[] arguments) throws Exception {
+        public Object invokeMethod(String methodName, Object[] arguments) throws Exception {
 
                 // Get the specific method identified by methodName and its arguments
@@ -134 +134 @@
         }
 
-        private Method loadMethod(String methodName,Object[] args) throws NoSuchMethodException {
+        private Method loadMethod(String methodName, Object[] args) throws NoSuchMethodException {
                 Method m = null;
 
                 // Obtain the class reference
                 Class<?> clazz = this.getClass();
-                Class<?>[] argArray = new Class<?>[args.length];
+                Class<?>[] argArray = null;
 
-                for (int i = 0; i < args.length; i++) {
-                        argArray[i] = args[i].getClass();
+                if (args != null) {
+                        argArray = new Class<?>[args.length];
+                        for (int i = 0; i < args.length; i++) {
+                                argArray[i] = args[i].getClass();
+                        }
                 }