# HG changeset patch # User Sascha L. Teichmann # Date 1312359928 0 # Node ID 388e709224ec82082aa6a15a160e29e4019c0dae # Parent aca3b46160cbf632d90ec5551346f92b6ee1e385 Fixed potential NPE in collection monitor flys-artifacts/trunk@2458 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r aca3b46160cb -r 388e709224ec flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Tue Aug 02 22:16:16 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Aug 03 08:25:28 2011 +0000 @@ -1,3 +1,8 @@ +2011-08-03 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java(extractOutputNames): + Fixed potential NPE. + 2011-08-03 Sascha L. Teichmann Added support for more than one db connection in datacage templating. diff -r aca3b46160cb -r 388e709224ec flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Tue Aug 02 22:16:16 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/CollectionMonitor.java Wed Aug 03 08:25:28 2011 +0000 @@ -70,9 +70,12 @@ CallContext context) { List outs = flys.getCurrentOutputs(context); - String[] names = new String[outs.size()]; - for (int i = 0, num = outs != null ? outs.size() : 0; i < num; i++) { + int num = outs == null ? 0 : outs.size(); + + String[] names = new String[num]; + + for (int i = 0; i < num; i++) { names[i] = outs.get(i).getName(); }