Projects >> eucalyptus >>527266b046763acacdebc3cee761b14ab57d89ab

Chunk
Conflicting content
		}

		@Override
<<<<<<< HEAD
		void dispatchFailure( final ActivityContext context, final Throwable throwable ) {
			final Optional serviceErrorOptional = AsyncExceptions.asWebServiceError( throwable );
			if ( serviceErrorOptional.isPresent( ) ) {
				r.set( failureResult( serviceErrorOptional.get( ).getCode( ) ) );
				if ( getResult( ) == null ) {
					super.dispatchFailure( context, throwable );
				}
			} else {
				super.dispatchFailure( context, throwable );
=======
		boolean dispatchFailure( final ActivityContext context, final Throwable throwable ) {
			final Optional serviceErrorOptional = AsyncExceptions.asWebServiceError( throwable );
			if ( serviceErrorOptional.isPresent( ) ){
				final R result = getFailureResult( serviceErrorOptional.get( ).getCode( ) );
				if ( result != null ) {
					r.set( result );
					return true;
				} else {
					return super.dispatchFailure( context, throwable );
				}
			} else {
				return super.dispatchFailure( context, throwable );
>>>>>>> a8405c93411b0a3baf382e39f6ced7097e893978
			}
		}
	}
Solution content
		}

		@Override
		boolean dispatchFailure( final ActivityContext context, final Throwable throwable ) {
			final Optional serviceErrorOptional = AsyncExceptions.asWebServiceError( throwable );
			if ( serviceErrorOptional.isPresent( ) ){
				final R result = getFailureResult( serviceErrorOptional.get( ).getCode( ) );
				if ( result != null ) {
					r.set( result );
					return true;
				} else {
					return super.dispatchFailure( context, throwable );
				}
			} else {
				return super.dispatchFailure( context, throwable );
			}
		}
	}
File
EucalyptusActivityTasks.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Return statement
Variable