You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/11/18 22:12:23 UTC
svn commit: r1543162 - in
/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf:
bus/extension/ExtensionManagerImpl.java
databinding/source/XMLStreamDataReader.java
Author: dkulp
Date: Mon Nov 18 21:12:23 2013
New Revision: 1543162
URL: http://svn.apache.org/r1543162
Log:
Fix checkstyle issues after merges
Modified:
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java?rev=1543162&r1=1543161&r2=1543162&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java Mon Nov 18 21:12:23 2013
@@ -31,8 +31,8 @@ import java.util.Enumeration;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.Bus;
@@ -344,7 +344,7 @@ public class ExtensionManagerImpl implem
boolean loaded = false;
for (Extension ex : all.values()) {
synchronized (ex) {
- Class<?> cls = ex.getClassObject(loader);
+ Class<?> cls = ex.getClassObject(loader);
if (cls != null
&& ex.getLoadedObject() == null
&& type.isAssignableFrom(cls)
Modified: cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java?rev=1543162&r1=1543161&r2=1543162&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java (original)
+++ cxf/branches/2.7.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java Mon Nov 18 21:12:23 2013
@@ -224,8 +224,8 @@ public class XMLStreamDataReader impleme
message.getExchange().getService().getServiceInfos().get(0))) {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(ds);
XMLStreamReader filteredReader =
- StaxUtils.createFilteredReader(reader,
- new StaxStreamFilter(new QName[] {XOP}));
+ StaxUtils.createFilteredReader(reader,
+ new StaxStreamFilter(new QName[] {XOP}));
StaxUtils.copy(filteredReader, nullWriter);
stax = true;
}