perfsonar development work

Author: michael.bischoff
Date: 2007-09-06 12:09:43 -0400 (Thu, 06 Sep 2007)
New Revision: 262

Modified:
   trunk/nmwg/java/org/ggf/ns/nmwg/tools/flow/v2_0/Datum.java
Log:
null check added

Modified: trunk/nmwg/java/org/ggf/ns/nmwg/tools/flow/v2_0/Datum.java
===================================================================
--- trunk/nmwg/java/org/ggf/ns/nmwg/tools/flow/v2_0/Datum.java  2007-09-06 
14:30:50 UTC (rev 261)
+++ trunk/nmwg/java/org/ggf/ns/nmwg/tools/flow/v2_0/Datum.java  2007-09-06 
16:09:43 UTC (rev 262)
@@ -453,157 +453,157 @@
         * the children elements.
         */     
        public void getDOM(org.w3c.dom.Element parent) {
-               org.w3c.dom.Document doc = parent.getOwnerDocument();
-               org.w3c.dom.Element datum = doc.createElementNS(getUri(), 
getQName()); 
+        org.w3c.dom.Document doc = parent.getOwnerDocument();
+        org.w3c.dom.Element datum = doc.createElementNS(getUri(), 
getQName()); 
                parent.appendChild(datum);      
-               if(!(getValue().equals(""))) {
+               if(getValue() != null && !(getValue().equals(""))) {
                        datum.setAttribute("value", getValue());
                }  
-               if(!(getValueUnits().equals(""))) {
+               if(getValue() != null && !(getValueUnits().equals(""))) {
                        datum.setAttribute("valueUnits", getValueUnits());
                } 
-               if(!(getTimeType().equals(""))) {
+               if(getValue() != null && !(getTimeType().equals(""))) {
                        datum.setAttribute("timeType", getTimeType());
                } 
-               if(!(getTimeValue().equals(""))) {
+               if(getValue() != null && !(getTimeValue().equals(""))) {
                        datum.setAttribute("timeValue", getTimeValue());
                }                       
-               if(!(getNumBytes().equals(""))) {
+               if(getValue() != null && !(getNumBytes().equals(""))) {
                        datum.setAttribute("numBytes", getNumBytes());
                } 
-               if(!(getNumBytesUnits().equals(""))) {
+               if(getValue() != null && !(getNumBytesUnits().equals(""))) {
                        datum.setAttribute("numBytesUnits", 
getNumBytesUnits());
                }
-               if(!getDateFirstSeen().equals("")) {
+               if(getValue() != null && !getDateFirstSeen().equals("")) {
                        datum.setAttribute("dateFirstSeen", 
getDateFirstSeen());
                } 
-               if(!getDuration().equals("")) {
+               if(getDuration() != null && !getDuration().equals("")) {
                        datum.setAttribute("duration", getDuration());
                } 
-               if(!getProto().equals("")) {
+               if(getProto() != null && !getProto().equals("")) {
                        datum.setAttribute("proto",getProto());
                } 
-               if(!getTopStatistic().equals("")) {
+               if(getTopStatistic() != null && 
!getTopStatistic().equals("")) {
                        datum.setAttribute("topStatistic",getTopStatistic());
                } 
-               if(!getFlows().equals("")) {
+               if(getFlows() != null && !getFlows().equals("")) {
                        datum.setAttribute("flows",getFlows());
                } 
-               if(!getPackets().equals("")) {
+               if(getPackets() != null && !getPackets().equals("")) {
                        datum.setAttribute("packets",getPackets());
                } 
-               if(!getBytes().equals("")) {
+               if(getBytes() != null && !getBytes().equals("")) {
                        datum.setAttribute("bytes",getBytes());
                } 
-               if(!getPps().equals("")) {
+               if(getPps() != null && !getPps().equals("")) {
                        datum.setAttribute("pps",getPps());
                } 
-               if(!getBps().equals("")) {
+               if(getBps() != null && !getBps().equals("")) {
                        datum.setAttribute("bps",getBps());
                } 
-               if(!getBpp().equals("")) {
+               if(getBpp() != null && !getBpp().equals("")) {
                        datum.setAttribute("bpp",getBpp());
                }
-               if(!getFlows().equals("")) {
+               if(getFlows() != null && !getFlows().equals("")) {
                        datum.setAttribute("flows",getFlows());
                } 
-               if(!getFlowsTcp().equals("")) {
+               if(getFlowsTcp() != null && !getFlowsTcp().equals("")) {
                        datum.setAttribute("flowsTcp",getFlowsTcp());
                }
-               if(!getFlowsUdp().equals("")) {
+               if(getFlowsUdp() != null && !getFlowsUdp().equals("")) {
                        datum.setAttribute("flowsUdp",getFlowsUdp());
                }
-               if(!getFlowsIcmp().equals("")) {
+               if(getFlowsIcmp() != null && !getFlowsIcmp().equals("")) {
                        datum.setAttribute("flowsIcmp",getFlowsIcmp());
                }
-               if(!getFlowsOther().equals("")) {
+               if(getFlowsOther() != null && !getFlowsOther().equals("")) {
                        datum.setAttribute("flowsOther",getFlowsOther());
                }
-               if(!getPacketsTcp().equals("")) {
+               if(getPacketsTcp() != null && !getPacketsTcp().equals("")) {
                        datum.setAttribute("packetsTcp",getPacketsTcp());
                }
-               if(!getPacketsUdp().equals("")) {
+               if(getPacketsUdp() != null && !getPacketsUdp().equals("")) {
                        datum.setAttribute("packetsUdp",getPacketsUdp());
                }
-               if(!getPacketsIcmp().equals("")) {
+               if(getPacketsIcmp() != null && !getPacketsIcmp().equals("")) {
                        datum.setAttribute("packetsIcmp",getPacketsIcmp());
                }
-               if(!getPacketsOther().equals("")) {
+               if(getPacketsOther() != null && 
!getPacketsOther().equals("")) {
                        datum.setAttribute("packetsOther",getPacketsOther());
                }
-               if(!getBytesTcp().equals("")) {
+               if(getBytesTcp() != null && !getBytesTcp().equals("")) {
                        datum.setAttribute("bytesTcp",getBytesTcp());
                }
-               if(!getBytesUdp().equals("")) {
+               if(getBytesUdp() != null && !getBytesUdp().equals("")) {
                        datum.setAttribute("bytesUdp",getBytesUdp());
                }
-               if(!getBytesIcmp().equals("")) {
+               if(getBytesIcmp() != null && !getBytesIcmp().equals("")) {
                        datum.setAttribute("bytesIcmp",getBytesIcmp());
                }
-               if(!getBytesOther().equals("")) {
+               if(getBytesOther() != null && !getBytesOther().equals("")) {
                        datum.setAttribute("bytesOther",getBytesOther());
                }
-               if(!getFirst().equals("")) {
+               if(getFirst() != null && !getFirst().equals("")) {
                        datum.setAttribute("first",getFirst());
                }
-               if(!getLast().equals("")) {
+               if(getLast() != null && !getLast().equals("")) {
                        datum.setAttribute("last",getLast());
                }
-               if(!getMsecFirst().equals("")) {
+               if(getMsecFirst() != null && !getMsecFirst().equals("")) {
                        datum.setAttribute("msecFirst",getMsecFirst());
                }
-               if(!getMsecLast().equals("")) {
+               if(getMsecLast() != null && !getMsecLast().equals("")) {
                        datum.setAttribute("msecLast",getMsecLast());
                }
-               if(!getSequenceFailures().equals("")) {
+               if(getSequenceFailures() != null && 
!getSequenceFailures().equals("")) {
                        
datum.setAttribute("sequenceFailures",getSequenceFailures());
                }
-               if(!getAdressFamily().equals("")) {
+               if(getAdressFamily() != null && 
!getAdressFamily().equals("")) {
                        datum.setAttribute("adressFamily",getAdressFamily());
                }
-               if(!getTimeFirstSeen().equals("")) {
+               if(getTimeFirstSeen() != null && 
!getTimeFirstSeen().equals("")) {
                        
datum.setAttribute("timeFirstSeen",getTimeFirstSeen());
                }
-               if(!getMsecFirstSeen().equals("")) {
+               if(getMsecFirstSeen() != null && 
!getMsecFirstSeen().equals("")) {
                        
datum.setAttribute("msecFirstSeen",getMsecFirstSeen());
                }
-               if(!getTimeLastSeen().equals("")) {
+               if(getTimeLastSeen() != null && 
!getTimeLastSeen().equals("")) {
                        datum.setAttribute("timeLastSeen",getTimeLastSeen());
                }
-               if(!getMsecLastSeen().equals("")) {
+               if(getMsecLastSeen() != null && 
!getMsecLastSeen().equals("")) {
                        datum.setAttribute("msecLastSeen",getMsecLastSeen());
                }
-               if(!getProtocol().equals("")) {
+               if(getProtocol() != null && !getProtocol().equals("")) {
                        datum.setAttribute("protocol",getProtocol());
                }
-               if(!getSourceAddress().equals("")) {
+               if(getSourceAddress() != null && 
!getSourceAddress().equals("")) {
                        
datum.setAttribute("sourceAddress",getSourceAddress());
                }
-               if(!getSourcePort().equals("")) {
+               if(getSourcePort() != null && !getSourcePort().equals("")) {
                        datum.setAttribute("sourcePort",getSourcePort());
                }
-               if(!getDestinationAdress().equals("")) {
+               if(getDestinationAdress() != null && 
!getDestinationAdress().equals("")) {
                        
datum.setAttribute("destinationAdress",getDestinationAdress());
                }
-               if(!getDestinationPort().equals("")) {
+               if(getDestinationPort() != null && 
!getDestinationPort().equals("")) {
                        
datum.setAttribute("destinationPort",getDestinationPort());
                }
-               if(!getSourceAsNumber().equals("")) {
+               if(getSourceAsNumber() != null && 
!getSourceAsNumber().equals("")) {
                        
datum.setAttribute("sourceAsNumber",getSourceAsNumber());
                }
-               if(!getDestinationAsNumber().equals("")) {
+               if(getDestinationAsNumber() != null && 
!getDestinationAsNumber().equals("")) {
                        
datum.setAttribute("destinationAsNumber",getDestinationAsNumber());
                }
-               if(!getInputInterface().equals("")) {
+               if(getInputInterface() != null && 
!getInputInterface().equals("")) {
                        
datum.setAttribute("inputInterface",getInputInterface());
                }
-               if(!getOutputInterface().equals("")) {
+               if(getOutputInterface() != null && 
!getOutputInterface().equals("")) {
                        
datum.setAttribute("outputInterface",getOutputInterface());
                }
-               if(!getTcpFlag().equals("")) {
+               if(getTcpFlag() != null && !getTcpFlag().equals("")) {
                        datum.setAttribute("tcpFlag",getTcpFlag());
                }
-               if(!getTypeOfService().equals("")) {
+               if(getTypeOfService() != null && 
!getTypeOfService().equals("")) {
                        
datum.setAttribute("typeOfService",getTypeOfService());
                }
                if(getTime() != null) {