removed any special handling of asap management messages.

Author: thsc42

src/net/sharksystem/asap/ASAPEngine.java

@@ -290,6 +290,7 @@ public void handleConnection(InputStream is, OutputStream os,
     public void handleASAPOffer(ASAP_OfferPDU_1_0 asapOffer, ASAP_1_0 protocol, OutputStream os)
             throws ASAPException, IOException {
 
+        /*
         if(this.isASAPManagementMessage(asapOffer)) {
             //<<<<<<<<<<<<<<<<<<debug
             StringBuilder b = new StringBuilder();
@@ -299,20 +300,22 @@ public void handleASAPOffer(ASAP_OfferPDU_1_0 asapOffer, ASAP_1_0 protocol, Outp
             //>>>>>>>>>>>>>>>>>>>debug
             return;
         } else {
+         */
             //<<<<<<<<<<<<<<<<<<debug
             StringBuilder b = new StringBuilder();
             b.append(this.getLogStart());
-            b.append("ASAP Offer are not processed in this implementation");
+            b.append("ASAP Offer is not processed in this implementation");
             System.out.println(b.toString());
             //>>>>>>>>>>>>>>>>>>>debug
             return;
-        }
+//        }
     }
 
     public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU, ASAP_1_0 protocol,
                               InputStream is, OutputStream os, ASAPChunkReceivedListener listener)
             throws ASAPException, IOException {
 
+        /*
         if(this.isASAPManagementMessage(asapAssimiliationPDU)) {
             //<<<<<<<<<<<<<<<<<<debug
             StringBuilder b = new StringBuilder();
@@ -322,7 +325,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimiliationPDU,
             //>>>>>>>>>>>>>>>>>>>debug
             throw new ASAPException("got asap management assimilate - it's the wrong place for that - multiengine should be called");
         }
-
+*/
         String sender = asapAssimiliationPDU.getPeer();
         int eraSender = asapAssimiliationPDU.getEra();
 

src/net/sharksystem/asap/MultiASAPEngineFS_Impl.java

@@ -446,7 +446,8 @@ public boolean handleASAPManagementPDU(ASAP_PDU_1_0 asapPDU, ASAP_1_0 protocol,
         // else - channel does not exist - create by setting recipients
         System.out.println(this.getLogStart() + "create channel");
         asapStorage.createChannel(channelUri, recipients);
-        return true;
+//        return true;
+        return false;
     }
 
     private String getLogStart() {

test/net/sharksystem/asap/MultihopTests.java

@@ -122,22 +122,16 @@ public void createNonOpenStorage() throws IOException, ASAPException, Interrupte
         // wait a moment to give server socket time to be created
         Thread.sleep(10);
         ui.doCreateASAPMultiEngine("Bob");
-
         ui.doConnect("7070 Bob");
 
         // alice should be in era 1 (content has changed before connection) and bob era is 0 - no changes
-
         // wait a moment
         Thread.sleep(1000);
-
         // kill connections
         ui.doKill("all");
-
         // alice should stay in era 1 (no content change), bob should be in era 1 received something
-
         // wait a moment
         Thread.sleep(1000);
-
         // Bob should now have created an closed asap storage with three recipients
         ASAPStorage bobStorage = this.getFreshStorageByName(ui, "Bob:chat");