Merge branch 'refs/heads/hotfix/set_bulk_data_null_input' into sdl_android_parent/master

Mike Burke · Mike Burke · commit 97a7ddbe1ce3 · 2015-02-23T16:14:24.000-05:00
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android_lib/src/com/smartdevicelink/proxy/RPCStruct.java
@@ -62,7 +62,9 @@ public void setBulkData(byte[] bulkData) {
 		if (bulkData != null) {
 			this._bulkData = new byte[bulkData.length];
 			System.arraycopy(bulkData, 0, _bulkData, 0, bulkData.length);
-			//this._bulkData = bulkData;
+		}
+		else{
+		    this._bulkData = null;
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public void setBulkData(byte[] bulkData) {`
`62`	`62`	`if (bulkData != null) {`
`63`	`63`	`this._bulkData = new byte[bulkData.length];`
`64`	`64`	`System.arraycopy(bulkData, 0, _bulkData, 0, bulkData.length);`
`65`		`- //this._bulkData = bulkData;`
	`65`	`+ }`
	`66`	`+ else{`
	`67`	`+ this._bulkData = null;`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`