[dradis-svn] SF.net SVN: dradis:[1932] server/branches/RB-2.5/vendor/plugins/ nessus_upload/lib/nessus_upload/filters.rb

[<et...@us...>]

Revision: 1932
          http://dradis.svn.sourceforge.net/dradis/?rev=1932&view=rev
Author:   etdsoft
Date:     2010-03-05 15:40:48 +0000 (Fri, 05 Mar 2010)

Log Message:
-----------
Merging r1919 through r1930 into 'branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb'

This merges back to the release branch the fix to issue #2932569

Modified Paths:
--------------
    server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb

Property Changed:
----------------
    server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb

Modified: server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb
===================================================================
--- server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb	2010-03-05 15:28:39 UTC (rev 1931)
+++ server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb	2010-03-05 15:40:48 UTC (rev 1932)
@@ -31,7 +31,12 @@
 		current_host.start_time	= host.elements['startTime'].text
 		current_host.stop_time	= host.elements['stopTime'].text
 		current_host.dns_name	= host.elements['dns_name'].text
-		current_host.open_ports	= host.elements['num_ports'].text
+    if host.elements['num_ports']
+  		current_host.open_ports	= host.elements['num_ports'].text
+    else
+  		current_host.open_ports	= 0
+    end
+    
 		current_host.mac_address = host.elements['mac_addr'].text
 		current_host.netbios_name = host.elements['netbios_name'].text
 		


Property changes on: server/branches/RB-2.5/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb
___________________________________________________________________
Added: svn:mergeinfo
   + /server/branches/experimental/2009-06_refactorNodesTree-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1175-1185
/server/branches/experimental/2009-06_refactorWordExport-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1199-1206
/server/branches/experimental/2009-06_refactorWordExport_customfields-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1285-1296
/server/branches/experimental/2009-10_ExtJS30-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1540-1556
/server/branches/experimental/2009-12_rails2.3.5-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1685-1699
/server/branches/experimental/2010-01_RedCloth_Editor-etd/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1717-1788
/server/trunk/vendor/plugins/nessus_upload/lib/nessus_upload/filters.rb:1919-1930


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.