Author: jukka
Date: Fri Feb 22 09:45:48 2013
New Revision: 1448965
URL: http://svn.apache.org/r1448965
Log:
OAK-632: SegmentMK: Efficient updates of flat nodes
Avoid Java 7
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java?rev=1448965&r1=1448964&r2=1448965&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/Template.java
Fri Feb 22 09:45:48 2013
@@ -352,9 +352,8 @@ class Template {
int afterIndex = 0;
while (beforeIndex < beforeTemplate.properties.length
&& afterIndex < properties.length) {
- int d = Integer.compare(
- properties[afterIndex].hashCode(),
- beforeTemplate.properties[beforeIndex].hashCode());
+ int d = Integer.valueOf(properties[afterIndex].hashCode())
+ .compareTo(Integer.valueOf(beforeTemplate.properties[beforeIndex].hashCode()));
if (d == 0) {
d = properties[afterIndex].getName().compareTo(
beforeTemplate.properties[beforeIndex].getName());
|