Adjustments to firewall rules generation/initializations for running multiple benchmarks

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

diff --git a/iotjava/iotruntime/master/ObjectInitHandler.java b/iotjava/iotruntime/master/ObjectInitHandler.java
index 8234e8ffb0a72de04f2c8e911ef5b885f3f03c1b..94a982503545a5737ab7193ae9c85cef28bfd4cb 100644 (file)
--- a/iotjava/iotruntime/master/ObjectInitHandler.java
+++ b/iotjava/iotruntime/master/ObjectInitHandler.java
@@ -75,6 +75,23 @@ public final class ObjectInitHandler {
                bVerbose = _bVerbose;
                RuntimeOutput.print("ObjectInitHandler: Creating a new ObjectInitHandler object!", bVerbose);
        }
+       
+    /**
+        * Method clearObjectInitHandler()
+        * <p>
+        * Clear the data structure
+        *
+        * @return  void
+        */
+       public void clearObjectInitHandler() {
+
+               listField.clear();
+               listFieldToSetRelation.clear();
+               listFieldToObject.clear();
+               mapFieldToSecondObject.clear();
+               iNumOfFields = 0;
+               RuntimeOutput.print("ObjectInitHandler: Clearing ObjectInitHandler object's data structure!", bVerbose);
+       }
 
        /**
         * Method addField()
@@ -114,12 +131,11 @@ public final class ObjectInitHandler {
         * @param   strObjClassInterfaceName    String object class interface
         * @param       iRMIRegPort                                     Integer RMI registry port
         * @param       iRMIStubPort                            Integer RMI stub port
-        * @param       iRMICallbackPorts                       Integer RMI callback ports
         * @return  void
         */
        public void addObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort, Integer[] iRMICallbackPorts) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -128,7 +144,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = listFieldToObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort, iRMICallbackPorts);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }
@@ -150,7 +166,7 @@ public final class ObjectInitHandler {
         */
        public void addSecondObjectIntoField(String strField, String strIoTSlaveObjectHostAdd,
                String strObjName, String strObjClassName, String strObjClassInterfaceName,
-               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort, Integer[] iRMICallbackPorts) {
+               String strObjStubClsIntfaceName, int iRMIRegPort, int iRMIStubPort) {
 
                // Get index of strField
                int iFieldIndex = listField.indexOf(strField);
@@ -158,7 +174,7 @@ public final class ObjectInitHandler {
                List<ObjectInitInfo> list = mapFieldToSecondObject.get(iFieldIndex);
                // Create a new ObjectInitInfo for a new object in the field
                ObjectInitInfo objInitInfo = new ObjectInitInfo(strIoTSlaveObjectHostAdd, strObjName,
-                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort, iRMICallbackPorts);
+                       strObjClassName, strObjClassInterfaceName, strObjStubClsIntfaceName, iRMIRegPort, iRMIStubPort);
                // Add the new ObjectInitInfo
                list.add(objInitInfo);
        }