You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/06/13 19:43:51 UTC
svn commit: r667604 -
/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Author: markt
Date: Fri Jun 13 10:43:51 2008
New Revision: 667604
URL: http://svn.apache.org/viewvc?rev=667604&view=rev
Log:
Fix bug 45195. NPE when calling getAttribute(null).
The spec is unclear but this is a regression from 5.0.x
Modified:
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=667604&r1=667603&r2=667604&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Fri Jun 13 10:43:51 2008
@@ -1032,6 +1032,8 @@
throw new IllegalStateException
(sm.getString("standardSession.getAttribute.ise"));
+ if (name == null) return null;
+
return (attributes.get(name));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by Mark Thomas <ma...@apache.org>.
William A. Rowe, Jr. wrote:
>
> Tim Funk wrote:
>> Since there was never a release from trunk - there really isn't a
>> change log. When trunk is released as a new branch it should have a
>> RELEASE-NOTES which highlight why its a different branch but
>> maintaining change log for an unreleased version doesn't make much
>> sense to me.
>
> Hmmm - perhaps the simple fact that it's a code base is enough to warrant
> a change log against the last released flavor?
Nearly all of the changes in trunk get ported to 6.0.x where the change log
is kept up to date.
I agree changes that aren't going to be ported should be documented (code
clean-up, conversion to generics, etc should be summarised under a single
entry). That really needs a diff between the two to make sure we capture
everything. I just kicked such a diff off to see what it looks like.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Tim Funk wrote:
> Since there was never a release from trunk - there really isn't a change
> log. When trunk is released as a new branch it should have a
> RELEASE-NOTES which highlight why its a different branch but maintaining
> change log for an unreleased version doesn't make much sense to me.
Hmmm - perhaps the simple fact that it's a code base is enough to warrant
a change log against the last released flavor?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by Tim Funk <fu...@joedog.org>.
Since there was never a release from trunk - there really isn't a change
log. When trunk is released as a new branch it should have a
RELEASE-NOTES which highlight why its a different branch but maintaining
change log for an unreleased version doesn't make much sense to me.
-Tim
Filip Hanik - Dev Lists wrote:
> Mark Thomas wrote:
>>
>> Filip Hanik - Dev Lists wrote:
>>>
>>> hi Mark,
>>> can you please update the changelog
>>
>> For trunk? The changelog for trunk hasn't been been kept up to date
>> since it was created.
> then we should bring it up to date, and keep it up to date. trunk is no
> different in terms of changelog, or at least it shouldn't be.
>
> can't expect trunk to be the CTR for 6.0 forever
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
Mark Thomas wrote:
>
> Filip Hanik - Dev Lists wrote:
>>
>> hi Mark,
>> can you please update the changelog
>
> For trunk? The changelog for trunk hasn't been been kept up to date
> since it was created.
then we should bring it up to date, and keep it up to date. trunk is no
different in terms of changelog, or at least it shouldn't be.
can't expect trunk to be the CTR for 6.0 forever
Filip
>
> I don't see the point of keeping the trunk changelog updated for
> changes that will be in 6.0.x. There is some merit if the change is
> intended for the next release branch. That said, I would still want to
> do a diff between 6.0.x and the new release branch to get the complete
> picture.
>
> Mark
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by Mark Thomas <ma...@apache.org>.
Filip Hanik - Dev Lists wrote:
>
> hi Mark,
> can you please update the changelog
For trunk? The changelog for trunk hasn't been been kept up to date since
it was created.
I don't see the point of keeping the trunk changelog updated for changes
that will be in 6.0.x. There is some merit if the change is intended for
the next release branch. That said, I would still want to do a diff between
6.0.x and the new release branch to get the complete picture.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r667604 - /tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
Posted by Filip Hanik - Dev Lists <de...@hanik.com>.
hi Mark,
can you please update the changelog
thanks
Filip
markt@apache.org wrote:
> Author: markt
> Date: Fri Jun 13 10:43:51 2008
> New Revision: 667604
>
> URL: http://svn.apache.org/viewvc?rev=667604&view=rev
> Log:
> Fix bug 45195. NPE when calling getAttribute(null).
> The spec is unclear but this is a regression from 5.0.x
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=667604&r1=667603&r2=667604&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Fri Jun 13 10:43:51 2008
> @@ -1032,6 +1032,8 @@
> throw new IllegalStateException
> (sm.getString("standardSession.getAttribute.ise"));
>
> + if (name == null) return null;
> +
> return (attributes.get(name));
>
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org