0.26.0

Path concat fix.
Fix NPE in DSLink.shutdown().

Author: a-hansen

build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 group 'org.iot.dsa'
-version '0.25.0'
+version '0.26.0'
 
 sourceCompatibility = 1.6
 targetCompatibility = 1.6

dslink-core/src/main/java/org/iot/dsa/dslink/DSLink.java

@@ -356,15 +356,16 @@ public void save() {
      */
     public void shutdown() {
         stop();
-        if (runThread == null) {
+        Thread thread = runThread;
+        if (thread == null) {
             return;
         }
-        synchronized (runThread) {
-            try {
-                runThread.join();
-            } catch (Exception x) {
-                fine(x);
+        try {
+            synchronized (thread) {
+                thread.join();
             }
+        } catch (Exception x) {
+            fine(x);
         }
     }
 

dslink-core/src/main/java/org/iot/dsa/node/DSPath.java

@@ -56,15 +56,14 @@ public static StringBuilder concat(String leading, String trailing, StringBuilde
         }
         if (leading.charAt(leading.length() - 1) == '/') {
             if (trailing.charAt(0) == '/') {
-                bucket.append(trailing.substring(1));
+                return bucket.append(trailing.substring(1));
             }
         } else {
             if (trailing.charAt(0) != '/') {
                 bucket.append('/');
-                bucket.append(trailing);
             }
         }
-        return bucket;
+        return bucket.append(trailing);
     }
 
     /**

dslink-java-v2-poc/src/main/java/org/iot/dsa/dslink/test/MainNode.java renamed to dslink-java-v2-poc/src/main/java/org/iot/dsa/dslink/poc/MainNode.java

@@ -1,4 +1,4 @@
-package org.iot.dsa.dslink.test;
+package org.iot.dsa.dslink.poc;
 
 import org.iot.dsa.DSRuntime;
 import org.iot.dsa.dslink.DSMainNode;