diff options
| author | Greg Wilkins | 2014-07-23 06:53:13 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-07-23 06:53:13 +0000 |
| commit | fa3d7d0f7e02dee5285decb7786ab2575875ec84 (patch) | |
| tree | 4779123b752197d888e3e5c0cbbc2ce5cde732e5 /jetty-nosql | |
| parent | ecb3ab7e5bab9cad1338708c184d127c00a1bff5 (diff) | |
| parent | 3a6879d3e8efb895bf27803735785428f7ed3659 (diff) | |
| download | org.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.tar.gz org.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.tar.xz org.eclipse.jetty.project-fa3d7d0f7e02dee5285decb7786ab2575875ec84.zip | |
Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
Diffstat (limited to 'jetty-nosql')
| -rw-r--r-- | jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java | 2 | ||||
| -rw-r--r-- | jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java index 8b732d4d2b..ae92051e7a 100644 --- a/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java +++ b/jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java @@ -207,7 +207,7 @@ public class NoSqlSession extends MemSession /* ------------------------------------------------------------ */ public Object getVersion() { - return _version; + return _version; } @Override 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 d8556da87a..50384666f5 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 @@ -654,7 +654,7 @@ public class MongoSessionManager extends NoSqlSessionManager /*------------------------------------------------------------ */ private String getContextKey() { - return __CONTEXT + "." + _contextId; + return __CONTEXT + "." + _contextId; } /*------------------------------------------------------------ */ @@ -664,7 +664,7 @@ public class MongoSessionManager extends NoSqlSessionManager */ private String getContextAttributeKey(String attr) { - return getContextKey()+ "." + attr; + return getContextKey()+ "." + attr; } @ManagedOperation(value="purge invalid sessions in the session store based on normal criteria", impact="ACTION") |