Merge pull request #248 from Intermodalics/fix/remapping_arguments_not_set_in_native_node

adamantivm · web-flow · commit 13f47603af73 · 2017-06-20T13:53:15.000-03:00
Fix remapping member variable not set if argument is not null
diff --git a/rosjava/src/main/java/org/ros/node/NativeNodeMain.java b/rosjava/src/main/java/org/ros/node/NativeNodeMain.java
@@ -53,6 +53,8 @@ public NativeNodeMain(String libName, String[] remappings) {
     // if no remapping is needed, create an empty array
     if (remappings == null) {
       remappingArguments = new String[0];
+    } else {
+      remappingArguments = remappings;
     }
     
     log.info("Trying to load native library '" + libName + "'...");

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,8 @@ public NativeNodeMain(String libName, String[] remappings) {`
`53`	`53`	`// if no remapping is needed, create an empty array`
`54`	`54`	`if (remappings == null) {`
`55`	`55`	`remappingArguments = new String[0];`
	`56`	`+ } else {`
	`57`	`+ remappingArguments = remappings;`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`log.info("Trying to load native library '" + libName + "'...");`