You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2014/08/12 13:17:36 UTC
svn commit: r1617452 - in /jackrabbit/oak/branches/1.0: ./ oak-doc/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java
Author: chetanm
Date: Tue Aug 12 11:17:35 2014
New Revision: 1617452
URL: http://svn.apache.org/r1617452
Log:
OAK-2027 - SessionMBean fails to render due to NPE in getSessionAttributes
Merge 1617451
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1617451
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-doc:r1617451
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java?rev=1617452&r1=1617451&r2=1617452&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java Tue Aug 12 11:17:35 2014
@@ -147,7 +147,7 @@ public class SessionStats implements Ses
String[] atts = new String[attributes.size()];
int k = 0;
for (Entry<String, Object> attribute : attributes.entrySet()) {
- atts[k] = attribute.getKey() + '=' + attribute.getValue();
+ atts[k++] = attribute.getKey() + '=' + attribute.getValue();
}
return atts;
}