From a50afeb5d5ee0904c6c24742d6266ec177d28457 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 30 Sep 2014 12:17:56 +0000
Subject: [PATCH] SAM: Fix v3 LS publish, broken in -4 (ticket #1390)  - code
 cleanup in direction handling

---
 apps/sam/java/src/net/i2p/sam/SAMv1Handler.java       |  8 ++++----
 apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java |  4 ++--
 history.txt                                           | 11 +++++++++++
 router/java/src/net/i2p/router/RouterVersion.java     |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index 47a2c29e5..25a90cc70 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -280,14 +280,14 @@ class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatagramRece
                         if (_log.shouldLog(Log.DEBUG))
                             _log.debug("No DIRECTION parameter in STREAM session, defaulting to BOTH");
                         dir = "BOTH";
-                    }
-                    if (!dir.equals("CREATE") && !dir.equals("RECEIVE")
-                        && !dir.equals("BOTH")) {
+                    } else if (!dir.equals("CREATE") && !dir.equals("RECEIVE")
+                               && !dir.equals("BOTH")) {
                         if (_log.shouldLog(Log.DEBUG))
                             _log.debug("Unknown DIRECTION parameter value: [" + dir + "]");
                         return writeString("SESSION STATUS RESULT=I2P_ERROR MESSAGE=\"Unknown DIRECTION parameter\"\n");
+                    } else {
+                        props.remove("DIRECTION");
                     }
-                    props.remove("DIRECTION");
                 
                     streamSession = newSAMStreamSession(destKeystream, dir,props);
                 } else {
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
index 45002e4cd..ef732200f 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java
@@ -48,7 +48,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements SAMv3Handler.Sessi
 			return nick ;
 		}
 		
-		   /**
+	   /**
 	     * Create a new SAM STREAM session, according to information
 	     * registered with the given nickname
 	     *
@@ -61,7 +61,7 @@ class SAMv3StreamSession  extends SAMStreamSession implements SAMv3Handler.Sessi
 	    public SAMv3StreamSession(String login)
 	    		throws IOException, DataFormatException, SAMException
 	    {
-                super(getDB().get(login).getDest(), "CREATE",
+                super(getDB().get(login).getDest(), "BOTH",
                       getDB().get(login).getProps(),
                       getDB().get(login).getHandler());
 	    	this.nick = login ;
diff --git a/history.txt b/history.txt
index 6abeb2731..3cdb560ec 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,14 @@
+2014-09-30 zzz
+ * Logs: Fix displayed filename when empty (ticket #1386)
+ * SAM: Fix v3 LS publish, broken in -4 (ticket #1390)
+
+2014-09-29 zzz
+ * CPUID:
+   - Fix main() model and family calculation
+   - Add model string fetch from processor
+   - AMD model string tweaks
+ * i2psnark: Show subdirectory in table header on details page
+
 2014-09-27 zzz
  * CPUID:
    - Fix model and family calculations
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f6e6df3a5..4e28a2c8d 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;
 
     /** for example "-test" */
     public final static String EXTRA = "";