OicServer: Do not set resourceUri and and ehResult twice

intel · Nov 2, 2015 · 5291520 · 5291520
1 parent cbe691c
commit 5291520
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/OicServer.js b/lib/OicServer.js
@@ -29,8 +29,7 @@ _.extend( OicRequestEvent.prototype, {
 					} : null ),
 					sendVendorSpecificHeaderOptions: headerOptions,
 
-					// FIXME: This url should be a FQDN or COAP URL ?
-					resourceUri: iotivity.OCGetResourceUri( this.target ),
+					resourceUri: ( iotivity.OCGetResourceUri( this.target ) || "" ),
 					ehResult: iotivity.OCEntityHandlerResult.OC_EH_OK
 				};
 
@@ -41,9 +40,6 @@ _.extend( OicRequestEvent.prototype, {
 				};
 			}
 
-			oicResponse.resourceUri = iotivity.OCGetResourceUri( this.target );
-			oicResponse.ehResult = iotivity.OCEntityHandlerResult.OC_EH_OK;
-
 			var ret = iotivity.OCDoResponse( oicResponse );
 			if ( ret !== iotivity.OCStackResult.OC_STACK_OK ) {
 				reject( "OCDoResponse Error" );