From 74619a4c8b419b78fe6f8030ca7c387b54894cb7 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 24 Jun 2010 12:54:27 +0000
Subject: [PATCH] formatting

---
 .../integration/message/MessageBuilder.java               | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageBuilder.java
index 608f108036..92fcf4626e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageBuilder.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageBuilder.java
@@ -202,12 +202,10 @@ public final class MessageBuilder<T> {
 		if (!this.modified && this.originalMessage != null) {
 			return this.originalMessage;
 		}
-		if (payload instanceof Throwable){
-			Throwable t = (Throwable) payload;
-			return (Message<T>) new ErrorMessage(t, this.headers);
-		} else {
-			return new GenericMessage<T>(this.payload, this.headers);
+		if (this.payload instanceof Throwable) {
+			return (Message<T>) new ErrorMessage((Throwable) this.payload, this.headers);
 		}
+		return new GenericMessage<T>(this.payload, this.headers);
 	}
 
 	private void verifyType(String headerName, Object headerValue) {