You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/16 09:33:19 UTC
cxf git commit: More cleanup
Repository: cxf
Updated Branches:
refs/heads/master 802d168d4 -> 2e06ad9a4
More cleanup
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e06ad9a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e06ad9a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e06ad9a
Branch: refs/heads/master
Commit: 2e06ad9a423af0b51905ab87184097a7c7c936bd
Parents: 802d168
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Feb 15 18:34:31 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 16 09:20:36 2017 +0000
----------------------------------------------------------------------
.../configuration/blueprint/AbstractBPBeanDefinitionParser.java | 2 +-
.../cxf/configuration/spring/AbstractBeanDefinitionParser.java | 2 +-
.../main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java | 2 +-
.../transport/http/netty/server/NettyHttpServerEngineFactory.java | 2 +-
.../src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 5de387c..17bb768 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -210,7 +210,7 @@ public abstract class AbstractBPBeanDefinitionParser {
}
protected boolean isAttribute(String pre, String name) {
- return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+ return !"xmlns".equals(name) && (pre == null || !"xmlns".equals(pre))
&& !"abstract".equals(name) && !"lazy-init".equals(name)
&& !"id".equals(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index 431a72a..0423472 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -475,7 +475,7 @@ public abstract class AbstractBeanDefinitionParser
}
protected boolean isAttribute(String pre, String name) {
- return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+ return !"xmlns".equals(name) && (pre == null || !"xmlns".equals(pre))
&& !"abstract".equals(name) && !"lazy-init".equals(name) && !"id".equals(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
index b8a34ee..e387d92 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
@@ -68,7 +68,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
if (e != null) {
String ignore = DOMUtils.getAttributeValueEmptyNull(e, "ignore");
- if (ignore != null && ignore.equals("true")) {
+ if ("true".equals(ignore)) {
return;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
index 5df9767..9fd1700 100644
--- a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
+++ b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
@@ -174,7 +174,7 @@ public class NettyHttpServerEngineFactory implements BusLifeCycleListener {
String protocol) throws IOException {
LOG.log(Level.FINE, "CREATING_NETTY_SERVER_ENGINE", port);
TLSServerParameters tlsServerParameters = null;
- if (protocol.equals("https") && tlsServerParametersMap != null) {
+ if ("https".equals(protocol) && tlsServerParametersMap != null) {
tlsServerParameters = tlsServerParametersMap.get(Integer.toString(port));
}
NettyHttpServerEngine ref = getOrCreate(this, host, port, tlsServerParameters);
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e06ad9a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
index 3784a1d..1167308 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServer20.java
@@ -458,7 +458,7 @@ public class BookServer20 extends AbstractBusTestServerBase {
WebApplicationException {
if (ri.getResourceClass() == BookStore.class) {
String serverRead = context.getHeaders().getFirst("ServerReaderInterceptor");
- if (serverRead == null || !serverRead.equals("serverRead")) {
+ if (serverRead == null || !"serverRead".equals(serverRead)) {
throw new RuntimeException();
}
if (ui.getPath().endsWith("/async")) {