Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Checkstyle enforcer"
[controller.git]
/
opendaylight
/
sal
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
packet
/
IPv4.java
diff --git
a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java
b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java
index c7b97e9d483370d536559f2618507c3cc0279673..44318aab8c5c1626eb787b960acfaa3ede7bea29 100644
(file)
--- a/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java
+++ b/
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IPv4.java
@@
-542,10
+542,12
@@
public class IPv4 extends Packet {
* Deriving the Total Length here
*/
int payloadLength = 0;
* Deriving the Total Length here
*/
int payloadLength = 0;
- try {
- payloadLength = payload.serialize().length;
- } catch (PacketException e) {
- logger.error("", e);
+ if (payload != null) {
+ try {
+ payloadLength = payload.serialize().length;
+ } catch (PacketException e) {
+ logger.error("", e);
+ }
}
this.setTotalLength((short) (this.getHeaderLen() + payloadLength));
}
this.setTotalLength((short) (this.getHeaderLen() + payloadLength));