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 2020/10/07 11:08:44 UTC
[cxf] branch master updated: Fixing a few bugs
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 43cc974 Fixing a few bugs
43cc974 is described below
commit 43cc974bd09b7fa5f6f4c9d49d12d548773f2f13
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 7 09:34:39 2020 +0100
Fixing a few bugs
---
.../rs/security/oidc/idp/IdTokenResponseFilter.java | 2 +-
.../server/session/DefaultHttpSessionStore.java | 3 ---
.../org/apache/cxf/transport/jms/JMSConduit.java | 5 +++--
.../corba/processors/idl/FixedPtConstVisitor.java | 21 +++++++--------------
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index 2431389..674371e 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
@@ -80,7 +80,7 @@ public class IdTokenResponseFilter extends OAuthServerJoseJwtProducer implements
// if this token was refreshed then the cloned IDToken might need to have its
// issuedAt and expiry time properties adjusted
if (OAuthConstants.REFRESH_TOKEN_GRANT.equals(st.getGrantType())) {
- final Long iat = st.getIssuedAt();
+ final long iat = st.getIssuedAt();
idToken.setExpiryTime(iat + (idToken.getExpiryTime() - idToken.getIssuedAt()));
idToken.setIssuedAt(iat);
}
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
index b0d27e9..c82224d 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/session/DefaultHttpSessionStore.java
@@ -55,9 +55,6 @@ public class DefaultHttpSessionStore implements HttpSessionStore {
@Override
public NettyHttpSession findSession(String sessionId) {
- if (SESSIONS == null) {
- return null;
- }
return SESSIONS.get(sessionId);
}
diff --git a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
index 25cffca..abc9650 100644
--- a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
+++ b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
@@ -204,7 +204,7 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
if (staticReplyDestination == null) {
synchronized (this) {
if (staticReplyDestination == null) {
- staticReplyDestination = jmsConfig.getReplyDestination(session);
+ Destination staticReplyDestinationTmp = jmsConfig.getReplyDestination(session);
String messageSelector = JMSFactory.getMessageSelector(jmsConfig, conduitId);
if (jmsConfig.getMessageSelector() != null) {
@@ -222,7 +222,7 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
if (jmsConfig.isOneSessionPerConnection()) {
container = new PollingMessageListenerContainer(jmsConfig, true, this);
} else {
- container = new MessageListenerContainer(getConnection(), staticReplyDestination, this);
+ container = new MessageListenerContainer(getConnection(), staticReplyDestinationTmp, this);
}
container.setTransactionManager(jmsConfig.getTransactionManager());
@@ -236,6 +236,7 @@ public class JMSConduit extends AbstractConduit implements JMSExchangeSender, Me
container.start();
jmsListener = container;
addBusListener();
+ staticReplyDestination = staticReplyDestinationTmp;
}
}
}
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
index f8f67d4..38b01f3 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/idl/FixedPtConstVisitor.java
@@ -55,22 +55,15 @@ public class FixedPtConstVisitor implements Visitor {
public void visit(AST fixedNode) {
// <fixed_pt_const_type> ::= "fixed"
- XmlSchemaType stype = null;
CorbaType ctype = null;
- QName corbaTypeQName = CorbaConstants.NE_CORBA_FIXED;
-
- if (corbaTypeQName != null) {
- QName schemaTypeQName = Constants.XSD_DECIMAL;
- if (schemaTypeQName != null) {
- stype = schemas.getTypeByQName(schemaTypeQName);
- if (stype != null) {
- ctype = new CorbaType();
- ctype.setQName(corbaTypeQName);
- ctype.setType(stype.getQName());
- ctype.setName(stype.getQName().getLocalPart());
- }
- }
+ QName schemaTypeQName = Constants.XSD_DECIMAL;
+ XmlSchemaType stype = schemas.getTypeByQName(schemaTypeQName);
+ if (stype != null) {
+ ctype = new CorbaType();
+ ctype.setQName(CorbaConstants.NE_CORBA_FIXED);
+ ctype.setType(stype.getQName());
+ ctype.setName(stype.getQName().getLocalPart());
}
schemaType = stype;