Author: ilgrosso
Date: Thu May 30 12:53:40 2013
New Revision: 1487838
URL: http://svn.apache.org/r1487838
Log:
[SYNCOPE-376] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/resources/applicationContext.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1487794-1487837
Modified: syncope/trunk/console/src/main/resources/applicationContext.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/applicationContext.xml?rev=1487838&r1=1487837&r2=1487838&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/applicationContext.xml (original)
+++ syncope/trunk/console/src/main/resources/applicationContext.xml Thu May 30
12:53:40 2013
@@ -119,7 +119,7 @@ under the License.
<constructor-arg ref="httpClientParams"/>
</bean>
- <bean id="restTemplate" class="org.springframework.web.client.RestTemplate"
scope="session">
+ <bean id="restTemplate" class="org.springframework.web.client.RestTemplate"
scope="prototype">
<constructor-arg ref="httpClientFactory"/>
<property name="messageConverters">
<list>
