Move clone method to RPCStruct and clone there too

2 files changed, 9 insertions, 9 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
index eb2c850c6..b3382c7ad 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCMessage.java
@@ -55,13 +55,6 @@ public class RPCMessage extends RPCStruct  {
 	protected Hashtable<String, Object> function;

 

 

-	private static Hashtable<String, Object> cloneStore(RPCStruct rpcStruct){

-		if(rpcStruct!= null && rpcStruct.store !=null){

-			return (Hashtable)rpcStruct.store.clone();

-		}

-		return null;

-	}

-

 	public String getFunctionName() {

 		return (String)function.get(KEY_FUNCTION_NAME);

 	}

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index 433c20553..dd96cdc9b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
@@ -40,14 +40,21 @@ public class RPCStruct {
 	}

 	

 	protected RPCStruct(RPCStruct rpcs) {

-		this.store = rpcs.store;

+		this.store = cloneStore(rpcs);

 	}

 	

 	public RPCStruct(Hashtable<String, Object> hashtable) {

 		store = hashtable;

 		//store = (Hashtable<String, Object>) ObjectCopier.copy(hashtable);

 	}

-	

+

+	static Hashtable<String, Object> cloneStore(RPCStruct rpcStruct){

+		if(rpcStruct!= null && rpcStruct.store !=null){

+			return (Hashtable)rpcStruct.store.clone();

+		}

+		return null;

+	}

+

 	public void deserializeJSON(JSONObject jsonObject) throws JSONException {

 		store = JsonRPCMarshaller.deserializeJSONObject(jsonObject);