Merge remote-tracking branch 'origin/master' into jetty-8

Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml

1 files changed, 22 insertions, 6 deletions

diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
index e4eab9e057..5fb218df2d 100644
--- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
+++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
@@ -245,21 +245,37 @@ public class MongoSessionManager extends NoSqlSessionManager
             {
                 for (String name : attrs.keySet())
                 {
-                    if ( __METADATA.equals(name) )
+                    if (__METADATA.equals(name))
                     {
                         continue;
                     }
-                    
+
                     String attr = decodeName(name);
                     Object value = decodeValue(attrs.get(name));
-                    session.doPutOrRemove(attr,value);
-                    session.bindValue(attr,value);
+
+                    if (attrs.keySet().contains(name))
+                    {
+                        session.doPutOrRemove(attr,value);
+                        session.bindValue(attr,value);
+                    }
+                    else
+                    {
+                        session.doPutOrRemove(attr,value);
+                    }
+                }
+                // cleanup, remove values from session, that don't exist in data anymore:
+                for (String name : session.getNames())
+                {
+                    if (!attrs.keySet().contains(name))
+                    {
+                        session.doPutOrRemove(name,null);
+                        session.unbindValue(name,session.getAttribute(name));
+                    }
                 }
             }
 
             session.didActivate();
-            
-            
+
             return version;
         }
         catch (Exception e)