Merge branch 'master' of github.com:threerings/narya

2012-08-08 13:10:50 -07:00
parent 54587e4e3c 829139b1e7
commit 1e591c582a
1 changed files with 8 additions and 6 deletions
@@ -343,12 +343,14 @@ public abstract class PeerManager
        _self = new NodeRecord(
            _nodeName, hostName, (publicHostName == null) ? hostName : publicHostName,
            region, port);
-        _invoker.postUnit(new WriteOnlyUnit("registerNode(" + _self + ")") {
-            @Override
-            public void invokePersist () throws Exception {
-                _noderepo.updateNode(_self);
-            }
-        });
+        if (_nodeName != null) {
+            _invoker.postUnit(new WriteOnlyUnit("registerNode(" + _self + ")") {
+                @Override
+                public void invokePersist () throws Exception {
+                    _noderepo.updateNode(_self);
+                }
+            });
+        }

        // set the invocation service
        _nodeobj.setPeerService(_invmgr.registerProvider(this, PeerMarshaller.class));