Merge "fixed potential NPE"
authorEd Warnicke <eaw@cisco.com>
Fri, 13 Mar 2015 16:38:24 +0000 (16:38 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 13 Mar 2015 16:38:24 +0000 (16:38 +0000)

Trivial merge