Mercurial > dive4elements > framework
changeset 265:d52947ce8629
XMLUtils.xpathString() returns empty string not null.
artifacts/trunk@1976 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 23 May 2011 09:56:15 +0000 |
| parents | fa0d9acea897 |
| children | c42a07be9aee |
| files | ChangeLog artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 22 12:40:32 2011 +0000 +++ b/ChangeLog Mon May 23 09:56:15 2011 +0000 @@ -1,3 +1,8 @@ +2011-04-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java: + XMLUtils.xpathString() returns empty string not null. + 2011-04-22 Sascha L. Teichmann <sascha.teichmann@intevation.de> flys/issue65: Added Jetty HTTP server as a replacement option to foster
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java Sun May 22 12:40:32 2011 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/FactoryBootstrap.java Mon May 23 09:56:15 2011 +0000 @@ -406,6 +406,8 @@ String className = Config.getStringXPath( HTTP_SERVER, DEFAULT_HTTP_SERVER); + logger.info("using HTTP server: " + className); + try { Class clazz = Class.forName(className); httpServer = (HTTPServer)clazz.newInstance();
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java Sun May 22 12:40:32 2011 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/Standalone.java Mon May 23 09:56:15 2011 +0000 @@ -91,7 +91,7 @@ } protected Server createServer() { - return listen != null + return listen != null && listen.length() > 0 ? new Server(Protocol.HTTP, listen, port) : new Server(Protocol.HTTP, port); } @@ -124,7 +124,7 @@ component.getServers().add(server); server.getContext().getParameters().add( - "maxThreads", maxThreads != null + "maxThreads", maxThreads != null && maxThreads.length() > 0 ? maxThreads : MAX_THREADS_DEFAULT);