From 7ec8687efc5fa62d4c3363c6b1d032a31094c99c Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 20 Nov 2015 16:38:34 -0500
Subject: [PATCH] Fix retry-and-more Sample Bug

Incorrect SpEL for rename.
---
 .../samples/advice/FileTransferRenameAfterFailureDemo.java      | 2 +-
 .../META-INF/spring/integration/expression-advice-context.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java
index eb3c256f..bb20051b 100644
--- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java
+++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java
@@ -62,7 +62,7 @@ public class FileTransferRenameAfterFailureDemo {
 				  + "\n                                                          "
 				  + "\n    Press 'Enter' to terminate.                           "
 				  + "\n                                                          "
-				  + "\n    Place a file in ${java.io.tmpdir}/adviceDemo ending   "
+				  + "\n    Place a file in "+ System.getProperty("java.io.tmpdir") +"/adviceDemo ending   "
 				  + "\n    with .txt                                             "
 				  + "\n    The demo simulates a file transfer failure followed   "
 				  + "\n    by the Advice renaming the file; the result of the    "
diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
index 9af49c2e..41c100dd 100644
--- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
+++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml
@@ -34,7 +34,7 @@
 			<bean class="org.springframework.integration.handler.advice.ExpressionEvaluatingRequestHandlerAdvice">
 				<property name="onSuccessExpression" value="payload.delete()" />
 				<property name="successChannel" ref="afterSuccessDeleteChannel" />
-				<property name="onFailureExpression" value="payload.renameTo(payload.absolutePath + '.failed.to.send')" />
+				<property name="onFailureExpression" value="payload.renameTo(new java.io.File(payload.absolutePath + '.failed.to.send'))" />
 				<property name="failureChannel" ref="afterFailRenameChannel" />
 			</bean>
 		</int-ftp:request-handler-advice-chain>