[freenet-cvs] r14408 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-07-28 10:38:07 +0000 (Sat, 28 Jul 2007)
New Revision: 14408

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
   trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
Log:
Now we should have Global in almost all cases

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2007-07-28 01:58:43 UTC (rev 14407)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2007-07-28 10:38:07 UTC (rev 14408)
@@ -172,7 +172,7 @@
                                } catch (IdentifierCollisionException e) {
                                        success = false;
                                } catch (MessageInvalidException e) {
-                                       outputHandler.queue(new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, false));
+                                       outputHandler.queue(new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, e.global));
                                        return;
                                }
                        }
@@ -214,7 +214,7 @@
                                } catch (IdentifierCollisionException e) {
                                        success = false;
                                } catch (MessageInvalidException e) {
-                                       outputHandler.queue(new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, false));
+                                       outputHandler.queue(new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, e.global));
                                        return;
                                } catch (MalformedURLException e) {
                                        failedMessage = new 
ProtocolErrorMessage(ProtocolErrorMessage.FREENET_URI_PARSE_ERROR, true, null, 
id, message.global);

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2007-07-28 01:58:43 UTC (rev 14407)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2007-07-28 10:38:07 UTC (rev 14408)
@@ -60,7 +60,7 @@

                        // check for valid endmarker
                        if (fs.getEndMarker() != null && 
(!fs.getEndMarker().startsWith("End")) && (!"Data".equals(fs.getEndMarker()))) {
-                               FCPMessage err = new 
ProtocolErrorMessage(ProtocolErrorMessage.MESSAGE_PARSE_ERROR, false, "Invalid 
end marker: "+fs.getEndMarker(), fs.get("Identifer"), false);
+                               FCPMessage err = new 
ProtocolErrorMessage(ProtocolErrorMessage.MESSAGE_PARSE_ERROR, false, "Invalid 
end marker: "+fs.getEndMarker(), fs.get("Identifer"), fs.getBoolean("Global", 
false));
                                handler.outputHandler.queue(err);
                                continue;
                        }
@@ -72,7 +72,7 @@
                                msg = FCPMessage.create(messageType, fs, 
handler.bf, handler.server.core.persistentTempBucketFactory);
                                if(msg == null) continue;
                        } catch (MessageInvalidException e) {
-                               FCPMessage err = new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, false);
+                               FCPMessage err = new 
ProtocolErrorMessage(e.protocolCode, false, e.getMessage(), e.ident, e.global);
                                handler.outputHandler.queue(err);
                                continue;
                        }

Modified: trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java    2007-07-28 
01:58:43 UTC (rev 14407)
+++ trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java    2007-07-28 
10:38:07 UTC (rev 14408)
@@ -131,7 +131,7 @@
        }

        public void run(FCPConnectionHandler handler, Node node) throws 
MessageInvalidException {
-               throw new 
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "FetchError goes 
from server to client not the other way around", identifier, global);
+               throw new 
MessageInvalidException(ProtocolErrorMessage.INVALID_MESSAGE, "GetFailed goes 
from server to client not the other way around", identifier, global);
        }

 }