Changeset 3825

Timestamp:

Oct 12, 2007, 3:06:37 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #803: Experiment overview is broken if protocols with non-predefined protocol types are used

File:

• branches/2.4-stable/src/core/net/sf/basedb/util/overview/ExperimentOverview.java (modified) (1 diff)

branches/2.4-stable/src/core/net/sf/basedb/util/overview/ExperimentOverview.java

@@ -1500 +1500 @@
       {
         ProtocolType pt = protocol.getProtocolType();
-        if (!pt.getSystemId().equals(defaultProtocol.getType()))
+        String requiredId = defaultProtocol == null ? null : defaultProtocol.getType();
+        if (requiredId != null && !requiredId.equals(pt.getSystemId()))
         {
           failures.add(new Failure(Validator.INCORRECT_PROTOCOLTYPE, parentNode, null,