Revision: 1407
http://stripes.svn.sourceforge.net/stripes/?rev=1407&view=rev
Author: bengunter
Date: 2011-03-03 19:13:49 +0000 (Thu, 03 Mar 2011)
Log Message:
-----------
Applied fix for STS-799 from 1.5.x branch.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/action/StreamingResolution.java
trunk/stripes/src/net/sourceforge/stripes/config/BootstrapPropertyResolver.java
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
trunk/stripes/src/net/sourceforge/stripes/validation/NumberTypeConverterSupport.java
trunk/tests/src/net/sourceforge/stripes/controller/FlashScopeTests.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/action/StreamingResolution.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/action/StreamingResolution.java
2011-03-03 19:08:58 UTC (rev 1406)
+++ trunk/stripes/src/net/sourceforge/stripes/action/StreamingResolution.java
2011-03-03 19:13:49 UTC (rev 1407)
@@ -465,7 +465,7 @@
count += skip;
}
while ((length = this.inputStream.read(buffer, 0,
(int) Math.min(
- (long) buffer.length, byteRange.getEnd() + 1 -
count))) != -1) {
+ buffer.length, byteRange.getEnd() + 1 -
count))) != -1) {
out.write(buffer, 0, length);
count += length;
if (byteRange.getEnd() + 1 == count)
Modified:
trunk/stripes/src/net/sourceforge/stripes/config/BootstrapPropertyResolver.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/config/BootstrapPropertyResolver.java
2011-03-03 19:08:58 UTC (rev 1406)
+++
trunk/stripes/src/net/sourceforge/stripes/config/BootstrapPropertyResolver.java
2011-03-03 19:13:49 UTC (rev 1407)
@@ -144,7 +144,7 @@
if (className != null) {
// web.xml takes precedence
try {
- clazz = (Class<? extends T>) ReflectUtil.findClass(className);
+ clazz = ReflectUtil.findClass(className);
log.info("Class implementing/extending ",
targetType.getSimpleName(),
" found in web.xml: ", className);
}
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2011-03-03 19:08:58 UTC (rev 1406)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2011-03-03 19:13:49 UTC (rev 1407)
@@ -111,7 +111,7 @@
clazz = RuntimeConfiguration.class;
try {
- this.configuration = (Configuration) clazz.newInstance();
+ this.configuration = clazz.newInstance();
}
catch (Exception e) {
log.fatal(e,
Modified:
trunk/stripes/src/net/sourceforge/stripes/validation/NumberTypeConverterSupport.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/validation/NumberTypeConverterSupport.java
2011-03-03 19:08:58 UTC (rev 1406)
+++
trunk/stripes/src/net/sourceforge/stripes/validation/NumberTypeConverterSupport.java
2011-03-03 19:13:49 UTC (rev 1407)
@@ -99,8 +99,7 @@
String output = input.trim();
// Step 2: remove the currency symbol
- // The casts are to make sure we don't call replace(String regex,
String replacement)
- output = output.replace((CharSequence) currencySymbol, (CharSequence)
"");
+ output = output.replace(currencySymbol, "");
// Step 3: trim whitespace that might precede or follow currency symbol
output = output.trim();
Modified:
trunk/tests/src/net/sourceforge/stripes/controller/FlashScopeTests.java
===================================================================
--- trunk/tests/src/net/sourceforge/stripes/controller/FlashScopeTests.java
2011-03-03 19:08:58 UTC (rev 1406)
+++ trunk/tests/src/net/sourceforge/stripes/controller/FlashScopeTests.java
2011-03-03 19:13:49 UTC (rev 1407)
@@ -41,7 +41,7 @@
@DefaultHandler
public Resolution flash() {
HttpServletRequest req = getContext().getRequest();
- Map<String,String[]> params = (Map<String,String[]>)
req.getParameterMap();
+ Map<String,String[]> params = req.getParameterMap();
for (Map.Entry<String,String[]> entry : params.entrySet()) {
FlashScope flash =
FlashScope.getCurrent(getContext().getRequest(), true);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
