Fix Rebase issue with RA_ADAPTER check
authorErich Keane <erich.keane@intel.com>
Thu, 13 Aug 2015 22:47:50 +0000 (15:47 -0700)
committerErich Keane <erich.keane@intel.com>
Fri, 14 Aug 2015 00:58:39 +0000 (00:58 +0000)
RA_ADAPTER check was merged improperly, this removes the second
instance.

Change-Id: Id2d02251d55f6917804eb943ab6cbe7ed27bbf83
Signed-off-by: Erich Keane <erich.keane@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2202
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
resource/csdk/stack/src/ocstack.c

index bca27b6..67d8de5 100644 (file)
@@ -1589,14 +1589,6 @@ OCStackResult OCInit1(OCMode mode, OCTransportFlags serverFlags, OCTransportFlag
     }
 #endif
 
-#ifdef RA_ADAPTER
-    if(!gRASetInfo)
-    {
-        OC_LOG(ERROR, TAG, PCF("Need to call OCSetRAInfo before calling OCInit"));
-        return OC_STACK_ERROR;
-    }
-#endif
-
     OCStackResult result = OC_STACK_ERROR;
     OC_LOG(INFO, TAG, PCF("Entering OCInit"));