First benchmark working with capability-based RMI; adjustments in callbacks, etc.

[iot2.git] / iotjava / iotruntime / master / IoTMaster.java

diff --git a/iotjava/iotruntime/master/IoTMaster.java b/iotjava/iotruntime/master/IoTMaster.java
index 7b86afc38dafc0946418d704bc88e83fcd7eedb4..34f181ae372acbf383a476fab44959f92d47b3a8 100644 (file)
--- a/iotjava/iotruntime/master/IoTMaster.java
+++ b/iotjava/iotruntime/master/IoTMaster.java
@@ -553,6 +553,7 @@ public class IoTMaster {
 
                int iNumCallbackPorts = Integer.parseInt(STR_NUM_CALLBACK_PORTS);
                Integer[] rmiCallbackPorts = commHan.getCallbackPorts(strObjName, iNumCallbackPorts);
+
                // Iterate over port numbers and set up policies
                for (int i=0; i<iNumCallbackPorts; i++) {
                        routerConfig.configureRouterMainPolicies(strRouterAdd, strIoTSlaveControllerHostAdd, strIoTSlaveObjectHostAdd,
@@ -967,7 +968,6 @@ public class IoTMaster {
                                strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, 
                                commHan.getRMIRegPort(strObjName), commHan.getRMIStubPort(strObjName),
                                commHan.getCallbackPorts(strObjName, iNumOfPorts));
-
                        // ROUTING POLICY: first and second controller objects in IoTRelation
                        routerConfig.configureRouterMainPolicies(STR_ROUTER_ADD, strFirstIoTSlaveObjectHostAdd,
                                strSecondIoTSlaveObjectHostAdd, STR_TCP_PROTOCOL);
@@ -1026,7 +1026,7 @@ public class IoTMaster {
                                        // == COMMUNICATION WITH IOTSLAVE CONTROLLER TO FILL IN IOTRELATION (SECOND OBJECT)
                                        commMasterToSlave(new MessageGetObject(IoTCommCode.GET_IOTRELATION_SECOND_OBJECT,
                                                objSecObj.getIoTSlaveObjectHostAdd(), objSecObj.getObjectName(), objSecObj.getObjectClassName(),
-                                               objSecObj.getObjectClassInterfaceName(), objInitInfo.getObjectStubClassInterfaceName(),
+                                               objSecObj.getObjectClassInterfaceName(), objSecObj.getObjectStubClassInterfaceName(),
                                                objSecObj.getRMIRegistryPort(), objSecObj.getRMIStubPort(), objSecObj.getRMICallbackPorts()), 
                                                "Get IoTRelation second object!", inStream, outStream);
                                }