From 3e4962b22c3b1318bbbacb4f4c0ac9468da0e44f Mon Sep 17 00:00:00 2001
From: coderhyme <jhyo.kim@samsung.com>
Date: Mon, 14 Mar 2016 05:28:23 -0700
Subject: [PATCH] Fixed coding styles in TestBase.java of RE-android

Change-Id: I5cd88b6ee6c20312bc12d6c4082cbe046af5b13b
Signed-off-by: coderhyme <jhyo.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/5987
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---
 .../java/org/iotivity/service/TestBase.java          | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java

diff --git a/service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java b/service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java
old mode 100644
new mode 100755
index 9882002..1b78bd7
--- a/service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java
+++ b/service/resource-encapsulation/android/service/src/androidTest/java/org/iotivity/service/TestBase.java
@@ -25,11 +25,12 @@ public abstract class TestBase extends InstrumentationTestCase {
     private OnResourceDiscoveredListener mOnResourceDiscoveredListener = new OnResourceDiscoveredListener() {
         @Override
         public void onResourceDiscovered(
-                RcsRemoteResourceObject RcsRemoteResourceObject) {
-            if (mClient != null)
+                RcsRemoteResourceObject remoteObject) {
+            if (mClient != null) {
                 return;
+            }
 
-            mClient = RcsRemoteResourceObject;
+            mClient = remoteObject;
             synchronized (mCond) {
                 mCond.notify();
             }
@@ -53,8 +54,7 @@ public abstract class TestBase extends InstrumentationTestCase {
         while (mClient == null) {
             try {
                 RcsDiscoveryManager.DiscoveryTask discoveryTask = RcsDiscoveryManager
-                        .getInstance().discoverResourceByType(
-                                RcsAddress.multicast(), "/oic/res",
+                        .getInstance().discoverResourceByType(RcsAddress.multicast(),
                                 RESOURCETYPE, mOnResourceDiscoveredListener);
 
                 synchronized (mCond) {
@@ -71,9 +71,13 @@ public abstract class TestBase extends InstrumentationTestCase {
     protected void setServerAttrbutes(RcsResourceAttributes attrs)
             throws RcsException {
         RcsResourceObject.AttributesLock lock = mServer.getAttributesLock();
-        lock.lock().putAll(attrs);
-        lock.apply();
-        lock.unlock();
+
+        try {
+            lock.lock().putAll(attrs);
+            lock.apply();
+        } finally {
+            lock.unlock();
+        }
     }
 
     @Override
-- 
2.7.4