Merge pull request #7 from fourbites/master

Fix IllegalAccessError crash

core/src/main/java/com/threerings/presents/client/Client.java

@@ -870,11 +870,7 @@ public class Client
         }
         // otherwise queue this notification up to run on the run queue thread
         else {
-            _runQueue.postRunnable(new Runnable() {
+            _runQueue.postRunnable(() -> _observers.apply(op));
-                public void run () {
-                    _observers.apply(op);
-                }
-            });
         }
     }
 
@@ -894,8 +890,7 @@ public class Client
         // CLIENT_DID_LOGOFF; that may not have been invoked yet, so we don't want to clear out our
         // communicator reference immediately; instead we queue up a runnable unit to do so to
         // ensure that it won't happen until CLIENT_DID_LOGOFF was dispatched
-        _runQueue.postRunnable(new Runnable() {
+        _runQueue.postRunnable(() -> {
-            public void run () {
             // tell the object manager that we're no longer connected to the server
             if (_omgr instanceof ClientDObjectMgr) {
                 ((ClientDObjectMgr)_omgr).cleanup();
@@ -925,7 +920,6 @@ public class Client
                     }
                 }
             });
-            }
         });
     }
 

core/src/main/java/com/threerings/presents/client/ClientDObjectMgr.java

@@ -234,10 +234,8 @@ public class ClientDObjectMgr
         _flusher.cancel();
         _flushes.clear();
         _dead.clear();
-        _client.getRunQueue().postRunnable(new Runnable() {
+        _client.getRunQueue().postRunnable(() -> {
-            public void run () {
             _ocache.clear();
-            }
         });
     }
 

core/src/main/java/com/threerings/presents/server/RebootManager.java

@@ -282,6 +282,9 @@ public abstract class RebootManager
         // schedule the next warning
         final int nextLevel = level + 1;
         final int nextMinutes = (nextLevel == warnings.length) ? 0 : warnings[nextLevel];
+        if (_interval != null) {
+            _interval.cancel();
+        }
         _interval = _omgr.newInterval(new Runnable() {
             public void run () {
                 doWarning(nextLevel, nextMinutes);
@@ -303,6 +306,9 @@ public abstract class RebootManager
 
         log.info("Reboot delayed due to outstanding locks", "locks", _rebootLocks.elements());
         broadcast("m.reboot_delayed");
+        if (_interval != null) {
+            _interval.cancel();
+        }
         (_interval = _omgr.newInterval(new Runnable() {
             public void run () {
                 doWarning(getWarnings().length, 0);