You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/02/29 01:44:54 UTC
svn commit: r1294919 - in /openejb/trunk/openejb/server/openejb-client/src:
main/java/org/apache/openejb/client/Client.java
main/java/org/apache/openejb/client/EJBResponse.java
test/java/org/apache/openejb/client/LoginTestUtil.java
Author: dblevins
Date: Wed Feb 29 00:44:54 2012
New Revision: 1294919
URL: http://svn.apache.org/viewvc?rev=1294919&view=rev
Log:
Remove unused code added in OPENEJB-1165
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/LoginTestUtil.java
Modified: openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java?rev=1294919&r1=1294918&r2=1294919&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java (original)
+++ openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java Wed Feb 29 00:44:54 2012
@@ -67,21 +67,13 @@ public class Client {
public static Response request(Request req, Response res, ServerMetaData server) throws RemoteException {
try {
- return client.processRequest(req, res, server, null);
+ return client.processRequest(req, res, server);
} finally {
failed.remove();
}
}
- public static Response request(Request req, Response res, ServerMetaData server, URI preferedServerURI) throws RemoteException {
- try {
- return client.processRequest(req, res, server, preferedServerURI);
- } finally {
- failed.remove();
- }
- }
-
- protected Response processRequest(Request req, Response res, ServerMetaData server, URI preferredServerURI) throws RemoteException {
+ protected Response processRequest(Request req, Response res, ServerMetaData server) throws RemoteException {
if (server == null){
throw new IllegalArgumentException("Server instance cannot be null");
}
@@ -96,14 +88,7 @@ public class Client {
final Connection conn;
try {
- if (preferredServerURI != null) {
- conn = ConnectionManager.getConnection(preferredServerURI);
- } else {
- conn = ConnectionManager.getConnection(cluster, server, req);
- }
- if (res instanceof EJBResponse) {
- ((EJBResponse) res).setResponseServerURI(conn.getURI());
- }
+ conn = ConnectionManager.getConnection(cluster, server, req);
} catch (IOException e) {
throw new RemoteException("Unable to connect", e);
}
@@ -290,7 +275,10 @@ public class Client {
}
}
- final long time = System.nanoTime() - start;
+ if (logger.isLoggable(Level.FINEST)) {
+ final long time = System.nanoTime() - start;
+ logger.log(Level.FINEST, "");
+ }
} catch (RemoteException e) {
throw e;
@@ -306,9 +294,9 @@ public class Client {
conn.discard();
//If the preferred server URI is configured, we will not try to fail over to other servers
//Currently, while calling Future.cancel method remotely, the initial business method invocation server URI should be used.
- if ((e instanceof RetryException || getRetry()) && preferredServerURI == null) {
+ if ((e instanceof RetryException || getRetry())) {
try {
- processRequest(req, res, server, null);
+ processRequest(req, res, server);
} catch (RemoteFailoverException re) {
throw re;
} catch (RemoteException re) {
Modified: openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java?rev=1294919&r1=1294918&r2=1294919&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java (original)
+++ openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/EJBResponse.java Wed Feb 29 00:44:54 2012
@@ -27,8 +27,6 @@ public class EJBResponse implements Clus
private transient Object result;
private transient ServerMetaData server;
- private transient URI responseServerURI;
-
public EJBResponse() {
}
@@ -97,14 +95,6 @@ public class EJBResponse implements Clus
return s.toString();
}
- public URI getResponseServerURI() {
- return responseServerURI;
- }
-
- public void setResponseServerURI(URI responseServerURI) {
- this.responseServerURI = responseServerURI;
- }
-
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
byte version = in.readByte(); // future use
Modified: openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/LoginTestUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/LoginTestUtil.java?rev=1294919&r1=1294918&r2=1294919&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/LoginTestUtil.java (original)
+++ openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/LoginTestUtil.java Wed Feb 29 00:44:54 2012
@@ -17,7 +17,6 @@
*/
package org.apache.openejb.client;
-import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.rmi.RemoteException;
@@ -38,7 +37,7 @@ public class LoginTestUtil {
Client.setClient(new Client() {
@Override
- protected Response processRequest(Request req, Response res, ServerMetaData server, URI preferredServerURI) throws RemoteException {
+ protected Response processRequest(Request req, Response res, ServerMetaData server) throws RemoteException {
serverRequest = req;
return serverResponse;
}