Merge pull request #2646 from SCADA-LTS/fix/#2634_Fix_possible_Unrele…

…ased_lock

#2634 Fix possible Unreleased lock - Lock outside the try block

src/com/serotonin/timer/TimerTask.java

@@ -88,8 +88,8 @@ public boolean cancel() {
             boolean result = (state == SCHEDULED);
 
             if (completeBeforeCancel) {
+                cancelLock.writeLock().lock();
                 try {
-                    cancelLock.writeLock().lock();
                     state = CANCELLED;
                 }
                 finally {