perfsonar development work

Author: nina
Date: 2007-06-04 09:47:35 -0400 (Mon, 04 Jun 2007)
New Revision: 2450

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
Log:
Bug fix (introduced with usage of IPerfsonarSchema instead of a simple string 
for the schema)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java  
  2007-06-04 09:58:19 UTC (rev 2449)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java  
  2007-06-04 13:47:35 UTC (rev 2450)
@@ -42,7 +42,7 @@
                // 
                
                EchoMARequest r = new EchoMARequest();
-               if 
("http://schemas.perfsonar.net/2.0".equals(endpoint.getSchema()))
+               if 
(endpoint.getSchema().equals("http://schemas.perfsonar.net/2.0";))
                                
r.setEventType("http://schemas.perfsonar.net/tools/admin/echo/2.0";);
                r.setTimeout(100);
                return r;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java   
  2007-06-04 09:58:19 UTC (rev 2449)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PerfsonarSchema.java   
  2007-06-04 13:47:35 UTC (rev 2450)
@@ -45,7 +45,8 @@
        @Override
        public boolean equals(Object obj) {
                if (obj instanceof IPerfsonarSchema) return 
((IPerfsonarSchema) obj).getSchema().equals(schema);
-               else return toString().equals(obj.toString());
+               else 
+                       return getSchema().equals(obj.toString());
        }
        
     public int hashCode() {