You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/05/23 16:22:35 UTC
[1/2] cxf git commit: NPE fix
Repository: cxf
Updated Branches:
refs/heads/master f9a42a528 -> 05b12529f
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/05b12529
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/05b12529
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/05b12529
Branch: refs/heads/master
Commit: 05b12529f2bb037aa2c73564455c1b511ef715aa
Parents: 1e4b961
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon May 23 17:11:33 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon May 23 17:13:20 2016 +0100
----------------------------------------------------------------------
.../rs/security/oauth2/client/MemoryClientCodeStateManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/05b12529/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
index 33a95df..90b9e5c 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/MemoryClientCodeStateManager.java
@@ -56,7 +56,7 @@ public class MemoryClientCodeStateManager implements ClientCodeStateManager {
MultivaluedMap<String, String> redirectState) {
String stateParam = redirectState.getFirst(OAuthConstants.STATE);
String sessionToken = OAuthUtils.getSessionToken(mc, "state");
- if (!sessionToken.equals(stateParam)) {
+ if (sessionToken == null || !sessionToken.equals(stateParam)) {
throw new OAuthServiceException("Invalid session token");
}
return map.remove(stateParam);
[2/2] cxf git commit: Update hsqldb to a more modern version
Posted by co...@apache.org.
Update hsqldb to a more modern version
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e4b9612
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e4b9612
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e4b9612
Branch: refs/heads/master
Commit: 1e4b96124c326eb96804f6574419797e999acb40
Parents: f9a42a5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon May 23 17:07:28 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon May 23 17:13:20 2016 +0100
----------------------------------------------------------------------
rt/rs/security/oauth-parent/oauth2/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1e4b9612/rt/rs/security/oauth-parent/oauth2/pom.xml
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml
index 08f0a1e..e11491a 100644
--- a/rt/rs/security/oauth-parent/oauth2/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2/pom.xml
@@ -36,7 +36,7 @@
javax.servlet*;version="${cxf.osgi.javax.servlet.version}"
</cxf.osgi.import>
<hibernate.em.version>4.1.0.Final</hibernate.em.version>
- <hsqldb.version>1.8.0.10</hsqldb.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
<openjpa.version>2.4.0</openjpa.version>
</properties>
<dependencies>
@@ -104,7 +104,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>