You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/01/10 22:24:09 UTC
svn commit: r1431657 - in /camel/branches/camel-2.9.x: ./
camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Author: bvahdat
Date: Thu Jan 10 21:24:08 2013
New Revision: 1431657
URL: http://svn.apache.org/viewvc?rev=1431657&view=rev
Log:
Merged revisions 1431655 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1431655 | bvahdat | 2013-01-10 22:22:41 +0100 (Do, 10 Jan 2013) | 9 lines
Merged revisions 1431652 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1431652 | bvahdat | 2013-01-10 22:21:15 +0100 (Do, 10 Jan 2013) | 1 line
CAMEL-5948: Removed the two current() & length() methods and merged their logic into the Iterator methods.
........
................
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1431652
Merged /camel/branches/camel-2.10.x:r1431655
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java?rev=1431657&r1=1431656&r2=1431657&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java Thu Jan 10 21:24:08 2013
@@ -532,26 +532,18 @@ public final class ObjectHelper {
int idx = -1;
public boolean hasNext() {
- return (idx + 1) < length();
+ return (idx + 1) < Array.getLength(array);
}
public Object next() {
idx++;
- return current(idx);
+ return Array.get(array, idx);
}
public void remove() {
throw new UnsupportedOperationException();
}
- private int length() {
- return Array.getLength(array);
- }
-
- private Object current(int index) {
- return Array.get(array, index);
- }
-
};
} else {
List<Object> list = Arrays.asList((Object[]) value);