[richfaces-svn-commits] JBoss Rich Faces SVN: r13780 - in trunk/framework: impl/src/main/java/org/richfaces/model and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2009-04-22 15:15:07 -0400 (Wed, 22 Apr 2009)
New Revision: 13780

Modified:
   trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java
   trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
Log:
https://jira.jboss.org/jira/browse/RF-6663

Modified: trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java	2009-04-22 18:44:47 UTC (rev 13779)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/javascript/JSEncoder.java	2009-04-22 19:15:07 UTC (rev 13780)
@@ -77,6 +77,7 @@
                 (c == '<') || // - escape HTML markup characters
                 (c == '>') || // - HTML
                 (c == '&') || // - HTML
+                (c == '-') || // - HTML comments
                 (c < 0x20) || // See <http://www.w3.org/TR/REC-xml#charsets>
                 ((c > 0xd7ff) && (c < 0xe000)) || (c > 0xfffd)|| (c > 0xff)) {
             return (false);

Modified: trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java	2009-04-22 18:44:47 UTC (rev 13779)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java	2009-04-22 19:15:07 UTC (rev 13780)
@@ -117,7 +117,14 @@
 
 	@Override
 	public Object getRowKey() {
-		return rowKeys.indexOf(originalModel.getRowKey());
+		Object originalModelKey = originalModel.getRowKey();
+		int idx = rowKeys.indexOf(originalModelKey);
+
+		if (originalModelKey != null || idx >= 0) {
+			return idx;
+		} else {
+			return null;
+		}
 	}
 
 	@Override