提交 c24efa28 authored 作者: Thomas Mueller's avatar Thomas Mueller

Don't throw Error

上级 9f3cae24
...@@ -76,7 +76,7 @@ public class Newsfeed { ...@@ -76,7 +76,7 @@ public class Newsfeed {
s = StringUtils.replaceAll(s, "<br/>", ""); s = StringUtils.replaceAll(s, "<br/>", "");
s = StringUtils.replaceAll(s, "<br>", ""); s = StringUtils.replaceAll(s, "<br>", "");
if (s.indexOf('<') >= 0 || s.indexOf('>') >= 0) { if (s.indexOf('<') >= 0 || s.indexOf('>') >= 0) {
throw new Error("Unsupported HTML Tag: < or > in " + s); throw new RuntimeException("Unsupported HTML Tag: < or > in " + s);
} }
return s; return s;
} }
......
...@@ -121,7 +121,7 @@ public abstract class TestBase { ...@@ -121,7 +121,7 @@ public abstract class TestBase {
println("FAIL " + e.toString()); println("FAIL " + e.toString());
logError("FAIL " + e.toString(), e); logError("FAIL " + e.toString(), e);
if (config.stopOnError) { if (config.stopOnError) {
throw new Error("ERROR"); throw new AssertionError("ERROR");
} }
if (e instanceof OutOfMemoryError) { if (e instanceof OutOfMemoryError) {
throw (OutOfMemoryError) e; throw (OutOfMemoryError) e;
...@@ -254,9 +254,6 @@ public abstract class TestBase { ...@@ -254,9 +254,6 @@ public abstract class TestBase {
if (config.mvcc && url.indexOf("MVCC=") < 0) { if (config.mvcc && url.indexOf("MVCC=") < 0) {
url += ";MVCC=TRUE"; url += ";MVCC=TRUE";
} }
if (config.cache2Q && url.indexOf("CACHE_TYPE=") < 0) {
url += ";CACHE_TYPE=TQ";
}
if (config.diskResult && admin) { if (config.diskResult && admin) {
url += ";MAX_MEMORY_ROWS=100;CACHE_SIZE=0"; url += ";MAX_MEMORY_ROWS=100;CACHE_SIZE=0";
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论