You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2010/07/14 21:41:54 UTC
svn commit: r964150 - in /myfaces/trinidad/branches/1.2.12.3-branch: ./
trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
trinidad-sandbox/s...
Author: arobinson74
Date: Wed Jul 14 19:41:54 2010
New Revision: 964150
URL: http://svn.apache.org/viewvc?rev=964150&view=rev
Log:
TRINIDAD-1845 Commit the patch to the 1.2.12.3 branch
Modified:
myfaces/trinidad/branches/1.2.12.3-branch/ (props changed)
myfaces/trinidad/branches/1.2.12.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java
myfaces/trinidad/branches/1.2.12.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.12.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.12.3-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 19:41:54 2010
@@ -4,4 +4,4 @@
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
-/myfaces/trinidad/trunk:894885,915962
+/myfaces/trinidad/trunk:894885,915962,962582
Modified: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java?rev=964150&r1=964149&r2=964150&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java (original)
+++ myfaces/trinidad/branches/1.2.12.3-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImpl.java Wed Jul 14 19:41:54 2010
@@ -79,8 +79,13 @@ public class RowKeySetTreeImpl extends R
public boolean isContainedByDefault()
{
TreeModel model = getCollectionModel();
- Object rowkey = model.getRowKey();
- return new Search().find(rowkey).isDefaultContained;
+
+ if (model != null)
+ {
+ Object rowkey = model.getRowKey();
+ return new Search().find(rowkey).isDefaultContained;
+ }
+ return false;
}
@Override
@@ -387,7 +392,7 @@ public class RowKeySetTreeImpl extends R
int sz = ((rowkey != null) && (set.isDefaultContained ^ set.isDifferent)) ? 1 : 0;
if (set.isDefaultContained)
{
- if (!fetchall)
+ if (!fetchall || model == null)
return -1;
Object old = model.getRowKey();
@@ -704,7 +709,7 @@ public class RowKeySetTreeImpl extends R
{
PathIterator()
{
- _value = isEmpty() ? null : nextItem(); // initialize;
+ _value = (getCollectionModel() == null || isEmpty()) ? null : nextItem(); // initialize;
}
PathIterator(Object noop)
@@ -793,7 +798,7 @@ public class RowKeySetTreeImpl extends R
{
super(null);
_currIterator = _root.entrySet().iterator();
- _value = isEmpty() ? null : nextItem(); // initialize;
+ _value = (getCollectionModel() == null || isEmpty()) ? null : nextItem(); // initialize;
}
protected Object nextItem()
@@ -854,4 +859,4 @@ public class RowKeySetTreeImpl extends R
private static final long serialVersionUID = 1L;
private static final TrinidadLogger _LOG =
TrinidadLogger.createTrinidadLogger(RowKeySetTreeImpl.class);
-}
\ No newline at end of file
+}
Propchange: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 19:41:54 2010
@@ -3,4 +3,4 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885,915962
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885,915962,962582
Propchange: myfaces/trinidad/branches/1.2.12.3-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 14 19:41:54 2010
@@ -3,4 +3,4 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
-/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885,915962
+/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885,915962,962582