cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject [5/6] cxf git commit: Fix checkstyle issues after merges
Date Thu, 08 Jun 2017 17:02:52 GMT
Fix checkstyle issues after merges


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4feb04b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4feb04b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4feb04b9

Branch: refs/heads/3.1.x-fixes
Commit: 4feb04b9b96bddec2bcd6edbae15e29c1c2765bc
Parents: 621769d
Author: Daniel Kulp <dkulp@apache.org>
Authored: Thu Jun 8 13:02:22 2017 -0400
Committer: Daniel Kulp <dkulp@apache.org>
Committed: Thu Jun 8 13:02:22 2017 -0400

----------------------------------------------------------------------
 .../cxf/ws/rm/soap/RMSoapOutInterceptor.java      |  8 ++++----
 .../cxf/ws/rm/soap/RMSoapOutInterceptorTest.java  | 18 +++++++++---------
 .../org/apache/cxf/systest/ws/rm/ControlImpl.java |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
index cb070ad..5ed2734 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptor.java
@@ -131,9 +131,9 @@ public class RMSoapOutInterceptor extends AbstractSoapInterceptor {
             int startSize = headers.size();
             protocol.getCodec().buildHeaders(rmps, headers);
             if (startSize != headers.size() && MessageUtils.isPartialResponse(message))
{
-                    // make sure the response is returned as HTTP 200 and not 202
-                    message.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK);
-                }
+                // make sure the response is returned as HTTP 200 and not 202
+                message.put(Message.RESPONSE_CODE, HttpURLConnection.HTTP_OK);
+            }
         } catch (JAXBException je) {
             LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", je);
         }
@@ -160,4 +160,4 @@ public class RMSoapOutInterceptor extends AbstractSoapInterceptor {
             LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", je);
         }        
     }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
index 0056673..d5da583 100644
--- a/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
+++ b/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/soap/RMSoapOutInterceptorTest.java
@@ -274,18 +274,18 @@ public class RMSoapOutInterceptorTest extends Assert {
                     namespace = elem.getNamespaceURI();
                     localName = elem.getLocalName();
                 }
-                    if (RM10Constants.NAMESPACE_URI.equals(namespace)
-                        && localName.equals(name)) {
-                        found = true;
+                if (RM10Constants.NAMESPACE_URI.equals(namespace)
+                    && localName.equals(name)) {
+                    found = true;
                     iter.remove();
-                        break;
-                    } else if (Names.WSA_NAMESPACE_NAME.equals(namespace)
-                        && localName.equals(name)) {
-                        found = true;
+                    break;
+                } else if (Names.WSA_NAMESPACE_NAME.equals(namespace)
+                    && localName.equals(name)) {
+                    found = true;
                     iter.remove();
-                        break;
-                    }
+                    break;
                 }
+            }
             assertTrue("Could not find header element " + name, found);
         }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/4feb04b9/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
index 10a8127..37490e3 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ControlImpl.java
@@ -66,7 +66,7 @@ public class ControlImpl  extends org.apache.cxf.greeter_control.ControlImpl
{
         if (StringUtils.isEmpty(cfgResource)) {
             greeterBus = bf.createBus();
         } else {
-        greeterBus = bf.createBus(cfgResource);
+            greeterBus = bf.createBus(cfgResource);
         }
         System.clearProperty("db.name");
         BusFactory.setDefaultBus(greeterBus);


Mime
View raw message