# HG changeset patch # User Bjoern Ricks # Date 1345040419 0 # Node ID 4825950acf1e83b5d33141d66e1f05febc9a982b # Parent e703555f8da1420d0da48803b93ebdf4f8e80352 Avoid NullPointerException if user authetication is deactivated. If user Authentication is deactivated all rivers are returned. flys-client/trunk@5210 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r e703555f8da1 -r 4825950acf1e flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java --- a/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Wed Aug 15 12:56:07 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java Wed Aug 15 14:20:19 2012 +0000 @@ -91,7 +91,7 @@ String name = XMLUtils.xpathString( tmp, "@art:name", ArtifactNamespaceContext.INSTANCE); - if (user.canUseFeature("river:" + name)) { + if (user == null || user.canUseFeature("river:" + name)) { theRivers.add(new DefaultRiver(name)); rcount++; }