Permalink
Browse files

Merge branch '3.3'

  • Loading branch information...
2 parents 56ace9f + 96065cc commit 46cbc5abb66fd72513c0646136c71e747855226a micstriit committed Feb 8, 2012
View
5 railo-cfml/railo-admin/admin/extension/ExtensionManager.cfc
@@ -200,6 +200,11 @@
<!--- read group data --->
<cfset stepItem=xmlConfig.XmlChildren[stepIndex]>
<cfset stepAttrs=xmlConfig.XmlChildren[stepIndex].xmlAttributes>
+
+ <!--- Ignore the info block in the config --->
+ <cfif stepItem.XMLName EQ "info">
+ <cfcontinue>
+ </cfif>
<!--- Ignore the info block in the config --->
<cfif stepItem.XMLName EQ "info">
View
7 railo-java/railo-core/src/railo/commons/lang/StringUtil.java
@@ -496,7 +496,12 @@ public static String addZeros(long i, int size) {
if(rtn.length()<size) return repeatString("0",size-rtn.length())+rtn;
return rtn;
}
-
+
+ public static int indexOf(String haystack, String needle) {
+ if(haystack==null) return -1;
+ return haystack.indexOf(needle);
+ }
+
public static int indexOfIgnoreCase(String haystack, String needle) {
if(StringUtil.isEmpty(haystack) || StringUtil.isEmpty(needle)) return -1;
needle=needle.toLowerCase();
View
4 railo-java/railo-core/src/railo/runtime/Info.ini
@@ -1,7 +1,7 @@
[version]
-number=3.3.2.001
+number=3.3.2.002
level=os
state=final
name=Hachiko
name-explanation=http://en.wikipedia.org/wiki/Hachiko
-release-date=2012/02/03 15:04:55 CET
+release-date=2012/02/08 10:27:55 CET
View
6 railo-java/railo-core/src/railo/runtime/db/HSQLDBHandler.java
@@ -220,7 +220,7 @@ private void removeAll() {
try {
removeTable(tableName);
} catch (DatabaseException e) {
- ExceptionHandler.printStackTrace(e);
+ //ExceptionHandler.printStackTrace(e);
}
}
}
@@ -320,8 +320,8 @@ private QueryImpl _execute(PageContext pc, SQL sql, int maxrows, int fetchsize,
try {
return __execute(pc, sql, maxrows, fetchsize, timeout,stopwatch,tables,false);
}
- catch(PageException pe) {
- if(isUnion){
+ catch(PageException pe) {
+ if(isUnion || StringUtil.indexOf(pe.getMessage(), "NumberFormatException:")!=-1){
return __execute(pc, sql, maxrows, fetchsize, timeout,stopwatch,tables,true);
}
throw pe;
View
11 railo-java/railo-core/src/railo/runtime/img/ImageUtil.java
@@ -94,10 +94,10 @@ public static String getFormatFromExtension(Resource res, String defaultValue) {
if("tiff".equalsIgnoreCase(ext))return "tiff";
if("tif".equalsIgnoreCase(ext))return "tiff";
if("bmp".equalsIgnoreCase(ext))return "bmp";
- if("bmg".equalsIgnoreCase(ext))return "bmg";
+ if("bmp".equalsIgnoreCase(ext))return "bmp";
if("wbmp".equalsIgnoreCase(ext))return "wbmp";
if("ico".equalsIgnoreCase(ext))return "bmp";
- if("wbmg".equalsIgnoreCase(ext))return "wbmg";
+ if("wbmp".equalsIgnoreCase(ext))return "wbmp";
if("psd".equalsIgnoreCase(ext))return "psd";
if("fpx".equalsIgnoreCase(ext))return "fpx";
@@ -147,8 +147,8 @@ public static String getFormatFromMimeType(String mt, String defaultValue) {
if("application/tiff".equals(mt)) return "tiff";
if("application/x-tiff".equals(mt)) return "tiff";
- if("image/bmg".equals(mt)) return "bmg";
- if("image/vnd.wap.wbmp".equals(mt)) return "wbmg";
+ if("image/bmp".equals(mt)) return "bmp";
+ if("image/vnd.wap.wbmp".equals(mt)) return "wbmp";
if("image/fpx".equals(mt)) return "fpx";
if("image/x-fpx".equals(mt)) return "fpx";
@@ -210,9 +210,8 @@ public static String getMimeTypeFromFormat(String mt) throws IOException {
if("png".equals(mt)) return "image/png";
if("tiff".equals(mt)) return "image/tiff";
if("tif".equals(mt)) return "image/tiff";
- if("bmg".equals(mt)) return "image/bmp";
if("bmp".equals(mt)) return "image/bmp";
- if("wbmg".equals(mt)) return "image/vnd.wap.wbmp";
+ if("bmp".equals(mt)) return "image/bmp";
if("wbmp".equals(mt)) return "image/vnd.wap.wbmp";
if("fpx".equals(mt)) return "image/fpx";
View
4 railo-java/railo-core/src/railo/runtime/tag/Image.java
@@ -212,9 +212,9 @@ public void setFormat(String format) throws ApplicationException {
else if("jpeg".equalsIgnoreCase(format))this.format = "jpg";
else if("png".equalsIgnoreCase(format)) this.format = "png";
else if("tiff".equalsIgnoreCase(format))this.format = "tiff";
- else if("bmg".equalsIgnoreCase(format)) this.format = "bmg";
+ else if("bmp".equalsIgnoreCase(format)) this.format = "bmp";
else throw new ApplicationException("invalid format ["+format+"], " +
- "valid formats are [gif,jpg,png,tiff,bmg]");
+ "valid formats are [gif,jpg,png,tiff,bmp]");
}
View
2 railo-java/railo-core/src/railo/transformer/cfml/script/CFMLScriptTransformer.java
@@ -1254,7 +1254,7 @@ private Tag _paramStatement(Data data,Body parent) throws TemplateException {
// folgend wird tlt extra nicht Ÿbergeben, sonst findet prŸfung statt
- Attribute[] attrs = attributes(param,tlt,data,SEMI, NULL,"name","name",true);
+ Attribute[] attrs = attributes(param,tlt,data,SEMI, NULL,Boolean.TRUE,"name",true);
checkSemiColonLineFeed(data,true);
param.setTagLibTag(tlt);
View
BIN railo-java/railo-core/src/resource/context/railo-context.ra
Binary file not shown.

0 comments on commit 46cbc5a

Please sign in to comment.