This is an automated email from the ASF dual-hosted git repository.
coheigea 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 7fd63e8 Removing some unnecessary temporary variables
7fd63e8 is described below
commit 7fd63e8d23cd1c3eec1ff1b6272321112dc1258c
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Nov 8 11:25:10 2018 +0000
Removing some unnecessary temporary variables
---
.../main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java | 4 ++--
.../src/main/java/demo/colocated/client/DispatchSourceClient.java | 3 +--
.../basic/src/main/java/demo/jaxrs/server/CustomerService.java | 6 ++----
.../jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java | 3 +--
.../src/main/java/httpsdemo/server/CustomerServiceImpl.java | 3 +--
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +--
.../src/main/java/demo/jaxrs/service/CustomerServiceImpl.java | 6 ++----
.../main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java | 6 ++----
.../spring_security/src/main/java/demo/jaxrs/service/Order.java | 3 +--
.../websocket/src/main/java/demo/jaxrs/server/CustomerService.java | 3 +--
.../jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java | 3 +--
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +--
.../websocket_osgi/src/main/java/demo/jaxrs/server/Order.java | 3 +--
.../src/main/java/demo/jaxrs/server/CustomerService.java | 3 +--
.../websocket_web/src/main/java/demo/jaxrs/server/Order.java | 3 +--
.../java/demo/oauth/server/controllers/ApplicationController.java | 7 ++-----
.../src/main/java/demo/ws_addressing/common/ConciseFormatter.java | 3 +--
.../src/main/java/demo/ws_policy/common/ConciseFormatter.java | 3 +--
.../ws_rm/src/main/java/demo/ws_rm/common/ConciseFormatter.java | 3 +--
.../sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java | 3 +--
.../ut/src/main/java/demo/wssec/common/ConciseFormatter.java | 3 +--
.../java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java | 3 +--
.../cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java | 3 +--
.../org/apache/cxf/transport/https/HttpsURLConnectionFactory.java | 3 +--
24 files changed, 29 insertions(+), 57 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
index 9469498..bcc4def 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
@@ -230,8 +230,8 @@ public class DepthXMLStreamReader implements
XMLStreamReader {
public int nextTag() throws XMLStreamException {
int eventType = next();
- while ((eventType == XMLStreamConstants.CHARACTERS && isWhiteSpace())
- || (eventType == XMLStreamConstants.CDATA && isWhiteSpace())
+ while (eventType == XMLStreamConstants.CHARACTERS && isWhiteSpace()
+ || eventType == XMLStreamConstants.CDATA && isWhiteSpace()
// skip whitespace
|| eventType == XMLStreamConstants.SPACE
|| eventType == XMLStreamConstants.PROCESSING_INSTRUCTION
diff --git
a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 76ceacd..4f23420 100755
---
a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++
b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -106,8 +106,7 @@ public final class DispatchSourceClient {
private static Source encodeSource(String template, String value) throws
IOException {
String payload = value == null ? template : String.format(template,
value);
- Source source = new StreamSource(new
ByteArrayInputStream(payload.getBytes("utf-8")));
- return source;
+ return new StreamSource(new
ByteArrayInputStream(payload.getBytes("utf-8")));
}
private static String decodeSource(Source source, String uri, String name)
throws Exception {
diff --git
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
index cd25d8c..24df62b 100644
---
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -46,8 +46,7 @@ public class CustomerService {
public Customer getCustomer(@PathParam("id") String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
- Customer c = customers.get(idNumber);
- return c;
+ return customers.get(idNumber);
}
@PUT
@@ -99,8 +98,7 @@ public class CustomerService {
public Order getOrder(@PathParam("orderId") String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
index 09be1d3..ed88a9a 100644
---
a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
+++
b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Order.java
@@ -56,8 +56,7 @@ public class Order {
@Path("products/{productId}/")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
- Product p = products.get(Long.valueOf(productId));
- return p;
+ return products.get(Long.valueOf(productId));
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
index dbe4c9c..65427f4 100644
---
a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
+++
b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/CustomerServiceImpl.java
@@ -36,8 +36,7 @@ public class CustomerServiceImpl implements CustomerService {
public Customer getCustomer(String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
- Customer c = customers.get(idNumber);
- return c;
+ return customers.get(idNumber);
}
public Response updateCustomer(Customer customer) {
diff --git
a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
index 68b24db..db2fc7e 100644
---
a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -40,8 +40,7 @@ public class CustomerService {
public Customer getCustomer(@PathParam("id") String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
- Customer c = customers.get(idNumber);
- return c;
+ return customers.get(idNumber);
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
index eb80680..7677813 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
+++
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceImpl.java
@@ -36,8 +36,7 @@ public class CustomerServiceImpl implements CustomerService {
public Customer getCustomer(String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
- Customer c = customers.get(idNumber);
- return c;
+ return customers.get(idNumber);
}
public Response updateCustomer(Long id, Customer customer) {
@@ -77,8 +76,7 @@ public class CustomerServiceImpl implements CustomerService {
public Order getOrder(String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
index 7bf04c4..de0a270 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
+++
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
@@ -30,8 +30,7 @@ public class CustomerServiceSecuredImpl extends
AbstractCustomerServiceSecured {
public Customer getCustomer(String id) {
System.out.println("----invoking getCustomer, Customer id is: " + id);
long idNumber = Long.parseLong(id);
- Customer c = customers.get(idNumber);
- return c;
+ return customers.get(idNumber);
}
public Response updateCustomer(Long id, Customer customer) {
@@ -71,8 +70,7 @@ public class CustomerServiceSecuredImpl extends
AbstractCustomerServiceSecured {
public Order getOrder(String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
index c6492c8..95b5caf 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
+++
b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/Order.java
@@ -56,8 +56,7 @@ public class Order {
@Path("products/{productId}/")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
- Product p = products.get(Long.valueOf(productId));
- return p;
+ return products.get(Long.valueOf(productId));
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 51ba0e6..055bee3 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -124,8 +124,7 @@ public class CustomerService {
public Order getOrder(@PathParam("orderId") String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
@GET
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
index 09be1d3..ed88a9a 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Order.java
@@ -56,8 +56,7 @@ public class Order {
@Path("products/{productId}/")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
- Product p = products.get(Long.valueOf(productId));
- return p;
+ return products.get(Long.valueOf(productId));
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index 51ba0e6..055bee3 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -124,8 +124,7 @@ public class CustomerService {
public Order getOrder(@PathParam("orderId") String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
@GET
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
index 09be1d3..ed88a9a 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/Order.java
@@ -56,8 +56,7 @@ public class Order {
@Path("products/{productId}/")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
- Product p = products.get(Long.valueOf(productId));
- return p;
+ return products.get(Long.valueOf(productId));
}
final void init() {
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index 51ba0e6..055bee3 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -124,8 +124,7 @@ public class CustomerService {
public Order getOrder(@PathParam("orderId") String orderId) {
System.out.println("----invoking getOrder, Order id is: " + orderId);
long idNumber = Long.parseLong(orderId);
- Order c = orders.get(idNumber);
- return c;
+ return orders.get(idNumber);
}
@GET
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
index 09be1d3..ed88a9a 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/Order.java
@@ -56,8 +56,7 @@ public class Order {
@Path("products/{productId}/")
public Product getProduct(@PathParam("productId")int productId) {
System.out.println("----invoking getProduct with id: " + productId);
- Product p = products.get(Long.valueOf(productId));
- return p;
+ return products.get(Long.valueOf(productId));
}
final void init() {
diff --git
a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
index e81529b..d87ff63 100644
---
a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
+++
b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
@@ -116,9 +116,7 @@ public class ApplicationController implements
ServletContextAware {
clientManager.removeRegisteredClient(consumerKey);
-
- ModelAndView modelAndView = new ModelAndView(new
RedirectView("/app/listRegisteredClients"));
- return modelAndView;
+ return new ModelAndView(new
RedirectView("/app/listRegisteredClients"));
}
@RequestMapping("/revokeAccess")
@@ -127,8 +125,7 @@ public class ApplicationController implements
ServletContextAware {
clientManager.removeAllTokens(consumerKey);
- ModelAndView modelAndView = new ModelAndView(new
RedirectView("/app/listAuthorizedClients"));
- return modelAndView;
+ return new ModelAndView(new
RedirectView("/app/listAuthorizedClients"));
}
@RequestMapping("/displayVerifier")
diff --git
a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/common/ConciseFormatter.java
b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/common/ConciseFormatter.java
index 37d2690..27aefdc 100644
---
a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/common/ConciseFormatter.java
+++
b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/common/ConciseFormatter.java
@@ -25,9 +25,8 @@ import java.util.logging.SimpleFormatter;
public class ConciseFormatter extends SimpleFormatter {
public synchronized String format(LogRecord record) {
String longForm = super.format(record);
- String shortForm = longForm.indexOf("INFO: ") > 0
+ return longForm.indexOf("INFO: ") > 0
? longForm.substring(longForm.indexOf("INFO: ") + 6)
: longForm;
- return shortForm;
}
}
diff --git
a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/common/ConciseFormatter.java
b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/common/ConciseFormatter.java
index 30e7308..2f6b29b 100644
---
a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/common/ConciseFormatter.java
+++
b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/common/ConciseFormatter.java
@@ -25,9 +25,8 @@ import java.util.logging.SimpleFormatter;
public class ConciseFormatter extends SimpleFormatter {
public synchronized String format(LogRecord record) {
String longForm = super.format(record);
- String shortForm = longForm.indexOf("INFO: ") > 0
+ return longForm.indexOf("INFO: ") > 0
? longForm.substring(longForm.indexOf("INFO: ") + 6)
: longForm;
- return shortForm;
}
}
diff --git
a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/ConciseFormatter.java
b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/ConciseFormatter.java
index 497b425..a7e121c 100644
---
a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/ConciseFormatter.java
+++
b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/ConciseFormatter.java
@@ -25,9 +25,8 @@ import java.util.logging.SimpleFormatter;
public class ConciseFormatter extends SimpleFormatter {
public synchronized String format(LogRecord record) {
String longForm = super.format(record);
- String shortForm = longForm.indexOf("INFO: ") > 0
+ return longForm.indexOf("INFO: ") > 0
? longForm.substring(longForm.indexOf("INFO: ") + 6)
: longForm;
- return shortForm;
}
}
diff --git
a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
index 5da5600..fb0072d 100644
---
a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
+++
b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/common/ConciseFormatter.java
@@ -25,9 +25,8 @@ import java.util.logging.SimpleFormatter;
public class ConciseFormatter extends SimpleFormatter {
public synchronized String format(LogRecord record) {
String longForm = super.format(record);
- String shortForm = longForm.indexOf("INFO: ") > 0
+ return longForm.indexOf("INFO: ") > 0
? longForm.substring(longForm.indexOf("INFO: ") + 6)
: longForm;
- return shortForm;
}
}
diff --git
a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
index 5da5600..fb0072d 100644
---
a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
+++
b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
@@ -25,9 +25,8 @@ import java.util.logging.SimpleFormatter;
public class ConciseFormatter extends SimpleFormatter {
public synchronized String format(LogRecord record) {
String longForm = super.format(record);
- String shortForm = longForm.indexOf("INFO: ") > 0
+ return longForm.indexOf("INFO: ") > 0
? longForm.substring(longForm.indexOf("INFO: ") + 6)
: longForm;
- return shortForm;
}
}
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index 280ad13..8130f9b 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -711,9 +711,8 @@ public abstract class AbstractJAXBProvider<T> extends
AbstractConfigurableProvid
? Response.Status.BAD_REQUEST :
Response.Status.INTERNAL_SERVER_ERROR;
Response r = JAXRSUtils.toResponseBuilder(status)
.type(MediaType.TEXT_PLAIN).entity(message).build();
- WebApplicationException ex = read ?
ExceptionUtils.toBadRequestException(t, r)
+ throw read ? ExceptionUtils.toBadRequestException(t, r)
: ExceptionUtils.toInternalServerErrorException(t, r);
- throw ex;
}
protected void handleJAXBException(JAXBException e, boolean read) {
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
index ee4db08..5702168 100644
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitFactory.java
@@ -326,8 +326,7 @@ public class AsyncHTTPConduitFactory implements
HTTPConduitFactory {
@Override
public ManagedNHttpClientConnection create(final IOSession
iosession, final ConnectionConfig config) {
- ManagedNHttpClientConnection conn = super.create(iosession,
config);
- return conn;
+ return super.create(iosession, config);
}
};
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
index 5b51b30..9b480a9 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
@@ -103,8 +103,7 @@ public class HttpsURLConnectionFactory {
if (ex instanceof IOException) {
throw (IOException) ex;
}
- IOException ioException = new IOException("Error while
initializing secure socket", ex);
- throw ioException;
+ throw new IOException("Error while initializing secure
socket", ex);
}
}
