[Gzz-commits] storm/org/nongnu/storm/modules/gispmap GispPeer...

[Tuukka Hastrup]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Tuukka Hastrup <address@hidden> 03/05/13 08:36:02

Modified files:
        org/nongnu/storm/modules/gispmap: GispPeer.java 

Log message:
        run plain GispP2PMap if no pool or gateway

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/modules/gispmap/GispPeer.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: storm/org/nongnu/storm/modules/gispmap/GispPeer.java
diff -u storm/org/nongnu/storm/modules/gispmap/GispPeer.java:1.7 
storm/org/nongnu/storm/modules/gispmap/GispPeer.java:1.8
--- storm/org/nongnu/storm/modules/gispmap/GispPeer.java:1.7    Fri May  9 
11:52:47 2003
+++ storm/org/nongnu/storm/modules/gispmap/GispPeer.java        Tue May 13 
08:36:02 2003
@@ -87,9 +87,18 @@
        GispPeer peer = null;
        while(peer == null) {
            try {
-               peer = new GispPeer(publishedPool,
-                                   new TransientPool(indexTypes),
-                                   gisp_port, seeds);
+               if(publishedPool == null && gateway_port < 0) {
+                   new GispP2PMap(gisp_port, seeds);
+                   p("");
+                   p("No pools to publish and no gateway requested.");
+                   p("Plain GISP P2P map started instead of a full peer.");
+                   p("");
+                   break; // Leaving peer null!
+               } else {
+                   peer = new GispPeer(publishedPool,
+                                       new TransientPool(indexTypes),
+                                       gisp_port, seeds);
+               }
            } catch(java.net.BindException _) {
                p("Port "+gisp_port+" couldn't be used.");
                gisp_port++;