[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/web ...

[Ron Sigal]

  User: rsigal  
  Date: 07/11/22 04:32:19

  Modified:    src/tests/org/jboss/test/remoting/transport/web  Tag:
                        remoting_2_x WebInvocationHandler.java
  Log:
  JBREM-758, JBREM-792:  Minor refactoring; test if request is a String before calling String.startsWith().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.4.5   +13 -12    JBossRemoting/src/tests/org/jboss/test/remoting/transport/web/WebInvocationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebInvocationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/web/WebInvocationHandler.java,v
  retrieving revision 1.6.4.4
  retrieving revision 1.6.4.5
  diff -u -b -r1.6.4.4 -r1.6.4.5
  --- WebInvocationHandler.java	21 Nov 2007 07:01:58 -0000	1.6.4.4
  +++ WebInvocationHandler.java	22 Nov 2007 09:32:19 -0000	1.6.4.5
  @@ -79,19 +79,20 @@
      public Object invoke(InvocationRequest invocation) throws Throwable
      {
         // Print out the invocation request
  -      log.debug("Invocation request is: " + invocation.getParameter());
  -      if(NULL_RETURN_PARAM.equals(invocation.getParameter()))
  +      Object request = invocation.getParameter();
  +      log.debug("Invocation request is: " + request);
  +      if(NULL_RETURN_PARAM.equals(request))
         {
            return null;
         }
  -      else if(THROW_EXCEPTION_PARAM.equals(invocation.getParameter()))
  +      else if(THROW_EXCEPTION_PARAM.equals(request))
         {
            log.debug("throwing WebTestException");
            throw new WebTestException("This is an exception being thrown as part of test case.  It is intentional.");
         }
  -      else if(invocation.getParameter() instanceof ComplexObject)
  +      else if(request instanceof ComplexObject)
         {
  -         ComplexObject obj = (ComplexObject) invocation.getParameter();
  +         ComplexObject obj = (ComplexObject) request;
            if(obj.getSize() > 1024)
            {
               return LARGE_OBJECT_RESPONSE_VALUE;
  @@ -101,17 +102,17 @@
               return OBJECT_RESPONSE_VALUE;
            }
         }
  -      else if(STRING_RETURN_PARAM.equals(invocation.getParameter()))
  +      else if(STRING_RETURN_PARAM.equals(request))
         {
            // Just going to return static string as this is just simple example code.
            return RESPONSE_VALUE;
         }
  -      else if(USER_AGENT_PARAM.equals(invocation.getParameter()))
  +      else if(USER_AGENT_PARAM.equals(request))
         {
            // return user agent found in map
            return invocation.getRequestPayload().get("user-agent");
         }
  -      else if (SET_CONTENT_TYPE.equals(invocation.getParameter()))
  +      else if (SET_CONTENT_TYPE.equals(request))
         {
            Map returnPayload = invocation.getReturnPayload();
            if (returnPayload == null)
  @@ -122,13 +123,13 @@
            returnPayload.put("Content-Type", CONTENT_TYPE);
            return CONTENT_TYPE;
         }
  -      else if (GET_ADDRESS.equals(invocation.getParameter()))
  +      else if (GET_ADDRESS.equals(request))
         {
            InetAddress address = (InetAddress) invocation.getRequestPayload().get(Remoting.CLIENT_ADDRESS);
            log.info("returning address: " + address);
            return address;
         }
  -      else if (OPEN_CONNECTION.equals(invocation.getParameter()))
  +      else if (OPEN_CONNECTION.equals(request))
         {
            InetAddress addr = (InetAddress) invocation.getRequestPayload().get(Remoting.CLIENT_ADDRESS);
            log.info("creating socket connected to: " + addr);
  @@ -142,12 +143,12 @@
            s.close();
            return null;
         }
  -      else if (SEND_CALLBACK.equals(invocation.getParameter()))
  +      else if (SEND_CALLBACK.equals(request))
         {
            callbackHandler.handleCallback(new Callback("callback"));
            return null;
         }
  -      else if (((String)invocation.getParameter()).startsWith(COPY))
  +      else if (request instanceof String && ((String)request).startsWith(COPY))
         {
            return ((String) invocation.getParameter()).substring(5);
         }