You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by GitBox <gi...@apache.org> on 2020/05/06 12:27:53 UTC
[GitHub] [brooklyn-server] nakomis opened a new pull request #1096: Bumps cxf versions
nakomis opened a new pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] duncangrant commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
duncangrant commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r420989424
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,14 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
+ SessionIdManager idManager = preferredHandler.getSessionIdManager();
+ String id = idManager.getId(localSession.getId());
+ HttpSession preferredSession = preferredHandler.getSession(id);
+
+ if (preferredSession != null && !((Session)preferredSession).getExtendedId().equals(id))
Review comment:
I think you're comparing to the wrong id here? the localSession.getId returns the extended id and the idManager.getId returns the non-extended id
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] duncangrant commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
duncangrant commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r421364842
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,17 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
+ HttpSession preferredSession
+ if (preferredHandler == null) {
Review comment:
should be !=null
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] duncangrant commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
duncangrant commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r420983601
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,14 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
Review comment:
Needs and if preferredHAndler != null here
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] duncangrant commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
duncangrant commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r420983601
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,14 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
Review comment:
Needs an if preferredHAndler != null here
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] aledsage commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
aledsage commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r420769989
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,11 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
+ SessionIdManager idManager = ((DefaultSessionIdManager)preferredHandler.getSessionIdManager());
Review comment:
I see this code is mostly a copy of the impl of `sessionHandler.getHttpSession(String)`, which is now protected in jetty 9.4.22.
But your code does not call `session.setIdChanged(true)`, which that method does when the id doesn't match. I've no idea what the implications are of that difference!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] nakomis commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
nakomis commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r421375408
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,17 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
+ HttpSession preferredSession
+ if (preferredHandler == null) {
Review comment:
Doh! I'd written it for `== null` then changed the logic and forgot to change the check...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] aledsage commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
aledsage commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r420768632
##########
File path: rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
##########
@@ -217,7 +219,11 @@ private void invalidateAllSession(HttpSession preferredSession, HttpSession loca
private HttpSession findValidPreferredSession(HttpSession localSession, HttpServletRequest optionalRequest) {
if (localSession instanceof Session) {
SessionHandler preferredHandler = getPreferredJettyHandler((Session)localSession, true, true);
- HttpSession preferredSession = preferredHandler==null ? null : preferredHandler.getHttpSession(localSession.getId());
+
+ SessionIdManager idManager = ((DefaultSessionIdManager)preferredHandler.getSessionIdManager());
Review comment:
Why do we need to cast it to `DefaultSessionIdManager`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [brooklyn-server] aledsage commented on a change in pull request #1096: Bumps cxf versions
Posted by GitBox <gi...@apache.org>.
aledsage commented on a change in pull request #1096:
URL: https://github.com/apache/brooklyn-server/pull/1096#discussion_r421602143
##########
File path: pom.xml
##########
@@ -161,20 +161,21 @@
<aopalliance.version>1.0</aopalliance.version>
<commons-configuration.version>1.7</commons-configuration.version>
<commons-lang.version>2.4</commons-lang.version>
- <jax-rs-api.version>2.1.1</jax-rs-api.version>
+ <jax-rs-api.version>2.1.1</jax-rs-api.version> <!-- differs from jclouds 2.1.2, which depends on v2.0.1 -->
<maxmind.version>2.8.0-rc1</maxmind.version>
<maxmind-db.version>1.2.1</maxmind-db.version>
- <winrm4j.version>0.8.0</winrm4j.version>
+ <winrm4j.version>0.9.0-SNAPSHOT</winrm4j.version> <!-- FIXME NO CHECK IN -->
Review comment:
@nakomis please change this to 0.9.0, which has just been released (to be compatible with cxf 3.3.5)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org