Merge branch 'master' into resource-encapsulation

Conflicts:
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSAddress.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSRemoteResourceObject.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/common/RCSResourceAttributes.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/Builder.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSGetResponse.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSSetResponse.java
	service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/utils/DiscoveryType.java
	service/resource-encapsulation/src/resourceContainer/SConscript

Change-Id: I477f9106a4baaa8609635eab9782adbdf26c4b6a
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>

diff --cc service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
index 07cf4a1,2899183..066fecd
--- 1/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
--- 2/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
+++ b/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSDiscoveryManager.java
@@@ -169,7 -173,18 +173,19 @@@ public class RCSDiscoveryManager 
              String resourceType) throws RCSException {
  
          Log.i(LOG_TAG, "discoverResource called");
 +        String addr = address.getAddress();
+ 
+         if(null == address){
+             Log.e(LOG_TAG, "Empty Address");
+             throw (new RCSException("Empty Address"));
+         }
+         String addr = address.getAddress();
+ 
+         if(null == relativeURI || "" == relativeURI){
+             Log.e(LOG_TAG, "Empty URI");
+             throw (new RCSException("Empty URI"));
+         }
+ 
          DiscoveryType typeOfDiscovery = address.getTypeOfDiscovery();
          this.discoverResource(addr, typeOfDiscovery.ordinal(), relativeURI,
                  resourceType, m_discoverListener);

diff --cc service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/client/RCSRemoteResourceObject.java
Simple merge

diff --cc service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
index 2eb5361,7db95d1..19e6d4b
--- 1/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
--- 2/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
+++ b/service/resource-encapsulation/sdk/java/src/org/iotivity/ResourceEncapsulation/server/RCSResourceObject.java
@@@ -496,21 -498,23 +498,23 @@@ public class RCSResourceObject 
       *            policy to be set
       *
       *            {@link AutoNotifyPolicy}
+      *
       */
      public void setAutoNotifyPolicy(AutoNotifyPolicy policy) {
 -        Log.e(LOG_TAG, "setAutoNotifyPolicy called");
 +        Log.i(LOG_TAG, "setAutoNotifyPolicy called");
          this.nativeSetAutoNotifyPolicy(policy.ordinal());
      }
  
      /**
       * API for getting auto notify policy
       *
 -     * @return AntoNotify policy
 +     * @return AutoNotifyPolicy
       *
       *         {@link AutoNotifyPolicy}
+      *
       */
      public AutoNotifyPolicy getAutoNotifyPolicy() {
 -        Log.e(LOG_TAG, "getAutoNotifyPolicy called");
 +        Log.i(LOG_TAG, "getAutoNotifyPolicy called");
          return AutoNotifyPolicy.getAutoNotifyPolicy(this
                  .nativeGetAutoNotifyPolicy());
      }
@@@ -522,21 -526,23 +526,23 @@@
       *            policy to be set
       *
       *            {@link SetRequestHandlerPolicy}
+      *
       */
      public void setSetRequestHandlerPolicy(SetRequestHandlerPolicy policy) {
 -        Log.e(LOG_TAG, "setSetRequestHandlerPolicy called");
 +        Log.i(LOG_TAG, "setSetRequestHandlerPolicy called");
          this.nativeSetSetRequestHandlerPolicy(policy.ordinal());
      }
  
      /**
       * API for getting the SetRequestHandler Policy.
       *
 -     * @return Property of setRequesthandler
 +     * @return SetRequestHandlerPolicy
       *
       *         {@link SetRequestHandlerPolicy}
+      *
       */
      public SetRequestHandlerPolicy getSetRequestHandlerPolicy() {
 -        Log.e(LOG_TAG, "getSetRequestHandlerPolicy called");
 +        Log.i(LOG_TAG, "getSetRequestHandlerPolicy called");
          return SetRequestHandlerPolicy.getSetRequestHandlerPolicy(this
                  .nativeGetSetRequestHandlerPolicy());
      }