You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ge...@apache.org on 2012/06/26 04:32:12 UTC
svn commit: r1353804 - in /openejb/branches/openejb-3.1.x/server:
openejb-client/src/main/java/org/apache/openejb/client/
openejb-multicast/src/main/java/org/apache/openejb/server/discovery/
Author: genspring
Date: Tue Jun 26 02:32:11 2012
New Revision: 1353804
URL: http://svn.apache.org/viewvc?rev=1353804&view=rev
Log:
OPENEJB-1846 openejb 3.1 branch can't compile with JDK 5
Modified:
openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java
openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java
openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java
openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java
openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java
Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java?rev=1353804&r1=1353803&r2=1353804&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java Tue Jun 26 02:32:11 2012
@@ -45,7 +45,7 @@ public class RandomConnectionStrategy ex
this.locations = clusterMetaData.getLocations();
}
- @Override
+
public Iterator<URI> iterator() {
return new RandomIterator<URI>(locations);
}
@@ -57,16 +57,17 @@ public class RandomConnectionStrategy ex
private int size;
public RandomIterator(T[] items) {
- this.items = Arrays.copyOf(items, items.length);
+ this.items = (T[]) new Object[items.length];
+ System.arraycopy(items, 0, this.items, 0, items.length);
this.size = items.length;
}
- @Override
+
public boolean hasNext() {
return size > 0;
}
- @Override
+
public T next() {
if (!hasNext()) throw new NoSuchElementException();
@@ -84,9 +85,9 @@ public class RandomConnectionStrategy ex
return selectedObject;
}
- @Override
+
public void remove() {
throw new UnsupportedOperationException("remove");
}
}
-}
\ No newline at end of file
+}
Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java?rev=1353804&r1=1353803&r2=1353804&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java Tue Jun 26 02:32:11 2012
@@ -44,7 +44,7 @@ public class RoundRobinConnectionStrateg
return index();
}
- @Override
+
public Iterator<URI> iterator() {
return new RoundRobinIterator();
}
@@ -52,12 +52,12 @@ public class RoundRobinConnectionStrateg
private class RoundRobinIterator implements Iterator<URI> {
private final Set<URI> seen = new HashSet<URI>();
- @Override
+
public boolean hasNext() {
return seen.size() < locations.length;
}
- @Override
+
public URI next() {
if (!hasNext()) throw new NoSuchElementException();
@@ -67,7 +67,7 @@ public class RoundRobinConnectionStrateg
return location;
}
- @Override
+
public void remove() {
}
}
@@ -83,4 +83,4 @@ public class RoundRobinConnectionStrateg
return new RoundRobinIterable(cluster);
}
-}
\ No newline at end of file
+}
Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java?rev=1353804&r1=1353803&r2=1353804&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java Tue Jun 26 02:32:11 2012
@@ -61,7 +61,7 @@ public class StickyConnectionStrategy ex
this.iterable = secondaryConnectionStrategy.createIterable(cluster);
}
- @Override
+
public Iterator<URI> iterator() {
return new StickyIterator();
}
@@ -79,12 +79,12 @@ public class StickyConnectionStrategy ex
last = lastLocation;
}
- @Override
+
public boolean hasNext() {
return first && last != null || getIterator().hasNext();
}
- @Override
+
public URI next() {
if (!hasNext()) throw new NoSuchElementException();
@@ -106,7 +106,7 @@ public class StickyConnectionStrategy ex
return iterator;
}
- @Override
+
public void remove() {
}
}
Modified: openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java?rev=1353804&r1=1353803&r2=1353804&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java Tue Jun 26 02:32:11 2012
@@ -129,7 +129,7 @@ public class MultipointDiscoveryAgent im
return host;
}
- @Override
+
public String getName() {
return "multipoint";
}
@@ -306,4 +306,4 @@ public class MultipointDiscoveryAgent im
return multipointServer.getReconnectDelay();
}
-}
\ No newline at end of file
+}
Modified: openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java?rev=1353804&r1=1353803&r2=1353804&view=diff
==============================================================================
--- openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java (original)
+++ openejb/branches/openejb-3.1.x/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java Tue Jun 26 02:32:11 2012
@@ -943,7 +943,7 @@ public class MultipointServer {
if (!sessions[0].client && !sessions[1].client) {
// Case 1 -- Client is calling back
Arrays.sort(sessions, new Comparator<Session>() {
- @Override
+
public int compare(Session a, Session b) {
return (int) (b.created - a.created);
}