Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/RiverServiceImpl.java @ 3494:4825950acf1e
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
| author | Bjoern Ricks <bjoern.ricks@intevation.de> |
|---|---|
| date | Wed, 15 Aug 2012 14:20:19 +0000 |
| parents | d45fcf70b994 |
| children | f1814efec714 |
comparison
equal
deleted
inserted
replaced
| 3493:e703555f8da1 | 3494:4825950acf1e |
|---|---|
| 89 Node tmp = rivers.item(i); | 89 Node tmp = rivers.item(i); |
| 90 | 90 |
| 91 String name = XMLUtils.xpathString( | 91 String name = XMLUtils.xpathString( |
| 92 tmp, "@art:name", ArtifactNamespaceContext.INSTANCE); | 92 tmp, "@art:name", ArtifactNamespaceContext.INSTANCE); |
| 93 | 93 |
| 94 if (user.canUseFeature("river:" + name)) { | 94 if (user == null || user.canUseFeature("river:" + name)) { |
| 95 theRivers.add(new DefaultRiver(name)); | 95 theRivers.add(new DefaultRiver(name)); |
| 96 rcount++; | 96 rcount++; |
| 97 } | 97 } |
| 98 } | 98 } |
| 99 | 99 |