Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java?rev=1820547&r1=1820546&r2=1820547&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java Mon Jan 8 10:44:26 2018 @@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac public class OutInAxisOperation extends TwoChannelAxisOperation { - private static final Log log = LogFactory.getLog(OutInAxisOperation.class); + private static final Log log = LogFactory.getLog(OutInAxisOperation.class); public OutInAxisOperation() { super(); @@ -191,7 +191,7 @@ class OutInAxisOperationClient extends O if (!mc.getOptions().isUseSeparateListener()) { Boolean useAsyncOption = (Boolean) mc.getProperty(Constants.Configuration.USE_ASYNC_OPERATIONS); - if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: useAsyncOption " + useAsyncOption); + if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: useAsyncOption " + useAsyncOption); if (useAsyncOption != null) { useAsync = useAsyncOption.booleanValue(); } @@ -255,21 +255,21 @@ class OutInAxisOperationClient extends O } callbackReceiver = new CallbackReceiver(); axisOp.setMessageReceiver(callbackReceiver); - if (log.isDebugEnabled()) log.debug("OutInAxisOperation: callbackReceiver " + callbackReceiver + " : " + axisOp); + if (log.isDebugEnabled()) log.debug("OutInAxisOperation: callbackReceiver " + callbackReceiver + " : " + axisOp); } } SyncCallBack internalCallback = null; if (axisCallback != null) { callbackReceiver.addCallback(mc.getMessageID(), axisCallback); - if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: Creating axis callback"); + if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: Creating axis callback"); } else { if (log.isDebugEnabled()) { log.debug("Creating internal callback"); } internalCallback = new SyncCallBack(); callbackReceiver.addCallback(mc.getMessageID(), internalCallback); - if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: Creating internal callback"); + if (log.isDebugEnabled()) log.debug("OutInAxisOperationClient: Creating internal callback"); } /** @@ -303,7 +303,7 @@ class OutInAxisOperationClient extends O mc.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.TRUE); mc.getConfigurationContext().registerOperationContext(mc.getMessageID(), oc); AxisEngine.send(mc); - if (internalCallback != null) { + if (internalCallback != null) { internalCallback.waitForCompletion(options.getTimeOutInMilliSeconds()); // process the result of the invocation @@ -528,7 +528,7 @@ class OutInAxisOperationClient extends O * finally block. */ public synchronized void onComplete() { - complete = true; + complete = true; notify(); }
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java?rev=1820547&r1=1820546&r2=1820547&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java Mon Jan 8 10:44:26 2018 @@ -125,5 +125,5 @@ public class RobustOutOnlyAxisOperation return false; } - } + } } Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=1820547&r1=1820546&r2=1820547&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Mon Jan 8 10:44:26 2018 @@ -446,10 +446,10 @@ public class AxisConfiguration extends A Map<String, AxisEndpoint> endpoints = axisService.getEndpoints(); if (endpoints == null || endpoints.size() == 0) { - org.apache.axis2.deployment.util.Utils.addEndpointsToService( - axisService, axisService.getAxisConfiguration()); + org.apache.axis2.deployment.util.Utils.addEndpointsToService( + axisService, axisService.getAxisConfiguration()); endpoints = axisService.getEndpoints(); - } + } String serviceName = axisService.getName(); addToAllServicesMap(axisService); @@ -1098,7 +1098,7 @@ public class AxisConfiguration extends A } public void setInPhasesUptoAndIncludingPostDispatch( - List<Phase> inPhasesUptoAndIncludingPostDispatch) { + List<Phase> inPhasesUptoAndIncludingPostDispatch) { this.inPhasesUptoAndIncludingPostDispatch = inPhasesUptoAndIncludingPostDispatch; } @@ -1248,10 +1248,10 @@ public class AxisConfiguration extends A * @return ArrayList<AxisObserver> */ public ArrayList<AxisObserver> getObserversList() { - AxisObserver[] array = observerSet.toArray(new AxisObserver[observerSet.size()]); - ArrayList<AxisObserver> observers = new ArrayList<AxisObserver>(array.length); - observers.addAll(Arrays.asList(array)); - return observers; + AxisObserver[] array = observerSet.toArray(new AxisObserver[observerSet.size()]); + ArrayList<AxisObserver> observers = new ArrayList<AxisObserver>(array.length); + observers.addAll(Arrays.asList(array)); + return observers; } public boolean isStart() { @@ -1422,7 +1422,7 @@ public class AxisConfiguration extends A break; } case PhaseMetadata.OUT_FLOW : { - List<Phase> phaseList = phasesinfo.getOUTPhases(); + List<Phase> phaseList = phasesinfo.getOUTPhases(); phaseList = findAndInsertPhase(d, phaseList); if (phaseList != null) { phasesinfo.setOUTPhases(phaseList); @@ -1430,7 +1430,7 @@ public class AxisConfiguration extends A break; } case PhaseMetadata.FAULT_OUT_FLOW : { - List<Phase> phaseList = phasesinfo.getOutFaultPhaseList(); + List<Phase> phaseList = phasesinfo.getOutFaultPhaseList(); phaseList = findAndInsertPhase(d, phaseList); if (phaseList != null) { phasesinfo.setOUT_FaultPhases(phaseList); @@ -1438,7 +1438,7 @@ public class AxisConfiguration extends A break; } case PhaseMetadata.FAULT_IN_FLOW : { - List<Phase> phaseList = phasesinfo.getIN_FaultPhases(); + List<Phase> phaseList = phasesinfo.getIN_FaultPhases(); phaseList = findAndInsertPhase(d, phaseList); if (phaseList != null) { phasesinfo.setIN_FaultPhases(phaseList); @@ -1496,13 +1496,13 @@ public class AxisConfiguration extends A } private void processEndpoints(AxisService axisService, - AxisConfiguration axisConfiguration) throws AxisFault { + AxisConfiguration axisConfiguration) throws AxisFault { Map<String, AxisEndpoint> enspoints = axisService.getEndpoints(); if (enspoints == null || enspoints.size() == 0) { - org.apache.axis2.deployment.util.Utils.addEndpointsToService( - axisService, axisConfiguration); - } - } + org.apache.axis2.deployment.util.Utils.addEndpointsToService( + axisService, axisConfiguration); + } + } public boolean isChildFirstClassLoading(){ boolean childFirstClassLoading = false;
