You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/01/15 19:32:38 UTC
[cxf] branch master updated: cxf-core: update null check
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 91634e8 cxf-core: update null check
91634e8 is described below
commit 91634e844c1a062588ee3b338949d77621e3f8ab
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Jan 15 22:26:58 2020 +0300
cxf-core: update null check
---
.../cxf/common/classloader/ClassLoaderUtils.java | 4 ++--
.../org/apache/cxf/common/util/PrimitiveUtils.java | 21 +++++++--------------
.../cxf/common/util/PropertiesLoaderUtils.java | 4 ++--
.../java/org/apache/cxf/endpoint/ClientImpl.java | 10 ++++++----
.../main/java/org/apache/cxf/helpers/JavaUtils.java | 2 +-
.../java/org/apache/cxf/staxutils/StaxUtils.java | 20 ++++++++------------
.../apache/cxf/staxutils/W3CDOMStreamReader.java | 2 +-
7 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index 5f446f1..f049d5f 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -140,7 +140,7 @@ public final class ClassLoaderUtils {
url = callingClass.getResource(resourceName);
}
- if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ if ((url == null) && (resourceName.charAt(0) != '/')) {
return getResource('/' + resourceName, callingClass);
}
@@ -227,7 +227,7 @@ public final class ClassLoaderUtils {
}
- if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ if (ret.isEmpty() && (resourceName.charAt(0) != '/')) {
return getResources('/' + resourceName, callingClass);
}
return ret;
diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index cbf74c9..ae7128d 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@ -81,26 +81,19 @@ public final class PrimitiveUtils {
Object ret = value;
if (Integer.TYPE.equals(type) || Integer.class.equals(type)) {
ret = Integer.valueOf(value);
- }
- if (Byte.TYPE.equals(type) || Byte.class.equals(type)) {
+ } else if (Byte.TYPE.equals(type) || Byte.class.equals(type)) {
ret = Byte.valueOf(value);
- }
- if (Short.TYPE.equals(type) || Short.class.equals(type)) {
+ } else if (Short.TYPE.equals(type) || Short.class.equals(type)) {
ret = Short.valueOf(value);
- }
- if (Long.TYPE.equals(type) || Long.class.equals(type)) {
+ } else if (Long.TYPE.equals(type) || Long.class.equals(type)) {
ret = Long.valueOf(value);
- }
- if (Float.TYPE.equals(type) || Float.class.equals(type)) {
+ } else if (Float.TYPE.equals(type) || Float.class.equals(type)) {
ret = Float.valueOf(value);
- }
- if (Double.TYPE.equals(type) || Double.class.equals(type)) {
+ } else if (Double.TYPE.equals(type) || Double.class.equals(type)) {
ret = Double.valueOf(value);
- }
- if (Boolean.TYPE.equals(type) || Boolean.class.equals(type)) {
+ } else if (Boolean.TYPE.equals(type) || Boolean.class.equals(type)) {
ret = Boolean.valueOf(value);
- }
- if (Character.TYPE.equals(type) || Character.class.equals(type)) {
+ } else if ((Character.TYPE.equals(type) || Character.class.equals(type)) && value != null) {
ret = value.charAt(0);
}
return ret;
diff --git a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index f63a9b2..8dba12e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -73,8 +73,8 @@ public final class PropertiesLoaderUtils {
logger.log(level, msg, url.toString());
}
- try (InputStream is = url.openStream()) {
- properties.loadFromXML(new BufferedInputStream(is));
+ try (InputStream is = new BufferedInputStream(url.openStream())) {
+ properties.loadFromXML(is);
}
}
return properties;
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index b3322df..8a07112 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -539,10 +539,12 @@ public class ClientImpl
return processResult(message, exchange, oi, resContext);
} finally {
//ensure ResponseContext has HTTP RESPONSE CODE
- Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
- resContext.put(MessageContext.HTTP_RESPONSE_CODE, responseCode);
- resContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, responseCode);
- setResponseContext(resContext);
+ if (null != exchange) {
+ Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
+ resContext.put(MessageContext.HTTP_RESPONSE_CODE, responseCode);
+ resContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, responseCode);
+ setResponseContext(resContext);
+ }
if (origLoader != null) {
origLoader.reset();
}
diff --git a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
index d2f2e43..0c0aa65 100644
--- a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
@@ -55,7 +55,7 @@ public final class JavaUtils {
static {
String version = SystemPropertyAction.getProperty("java.version");
try {
- isJava8Before161 = version != null && version.startsWith("1.8.0_")
+ isJava8Before161 = version.startsWith("1.8.0_")
&& Integer.parseInt(version.substring(6)) < 161;
} catch (NumberFormatException ex) {
isJava8Before161 = false;
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index bdb2da4..b86501b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -1584,23 +1584,19 @@ public final class StaxUtils {
((Element)parent).setAttributeNode(attr);
break;
case XMLStreamConstants.CHARACTERS:
- if (parent != null) {
- Characters characters = ev.asCharacters();
- context.setRecordLoc(addLocation(doc,
- parent.appendChild(doc.createTextNode(characters.getData())),
- characters.getLocation(), context.isRecordLoc()));
- }
+ Characters characters = ev.asCharacters();
+ context.setRecordLoc(addLocation(doc,
+ parent.appendChild(doc.createTextNode(characters.getData())),
+ characters.getLocation(), context.isRecordLoc()));
break;
case XMLStreamConstants.COMMENT:
- if (parent != null) {
- parent.appendChild(doc.createComment(((javax.xml.stream.events.Comment)ev).getText()));
- }
+ parent.appendChild(doc.createComment(((javax.xml.stream.events.Comment)ev).getText()));
break;
case XMLStreamConstants.CDATA:
- Characters characters = ev.asCharacters();
+ Characters cdata = ev.asCharacters();
context.setRecordLoc(addLocation(doc,
- parent.appendChild(doc.createCDATASection(characters.getData())),
- characters.getLocation(), context.isRecordLoc()));
+ parent.appendChild(doc.createCDATASection(cdata.getData())),
+ cdata.getLocation(), context.isRecordLoc()));
break;
case XMLStreamConstants.PROCESSING_INSTRUCTION:
parent.appendChild(doc.createProcessingInstruction(((ProcessingInstruction)ev).getTarget(),
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index 072a9b2..aafe755 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -124,7 +124,7 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
prefix = "";
}
- if (name != null && "xmlns".equals(name)) {
+ if ("xmlns".equals(name)) {
frame.uris.add(value);
frame.prefixes.add("");
} else if (!prefix.isEmpty() && "xmlns".equals(prefix)) {