Changeset 2303

Timestamp:

03/21/08 09:45:17 (8 months ago)

Author:

callan

Message:

Further fixes for #894 that return some functionality for mismatched nullable primatives.

Location:

trunk/components/blitz

Files:

• etc/OMERO.xml (modified) (3 diffs)
• resources/ice.config (modified) (2 diffs)
• src/omero/util/IceMapper.java (modified) (3 diffs)

trunk/components/blitz/etc/OMERO.xml

@@ -33 +33 @@
          </adapter>
          <properties>
-            <property name="IcePatch2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+            <property name="IcePatch2.Admin.Endpoints" value="tcp -h mage.openmicroscopy.org.uk"/>
             <property name="IcePatch2.Admin.RegisterProcess" value="1"/>
             <property name="IcePatch2.InstanceName" value="${instance-name}"/>
@@ -49 +49 @@
            <property name="Glacier2.Client.Endpoints" value="${client-endpoints}"/>
            <property name="Glacier2.Server.Endpoints" value="${server-endpoints}"/>
-           <property name="Glacier2.Admin.Endpoints" value="tcp -h 127.0.0.1"/>
+           <property name="Glacier2.Admin.Endpoints" value="tcp -h mage.openmicroscopy.org.uk"/>
            <property name="Glacier2.Admin.RegisterProcess" value="1"/>
            <property name="Glacier2.InstanceName" value="${instance-name}"/>
@@ -112 +112 @@
     <node name="master">
       <server-instance template="Glacier2Template"
-        client-endpoints="tcp -h 127.0.0.1 -p 4063"
+        client-endpoints="tcp -h mage.openmicroscopy.org.uk -p 4063"
         session-timeout="300"
-        server-endpoints="tcp -h 127.0.0.1"/>
+        server-endpoints="tcp -h mage.openmicroscopy.org.uk"/>
       <server-instance template="BlitzTemplate" index="0"/>
       <server-instance template="ProcessorTemplate" index="0"/>

trunk/components/blitz/resources/ice.config

@@ -17 +17 @@
 # running scripts and similarly it may be useful to define it
 # here.
-Ice.Default.Router=OMERO.Glacier2/router:tcp -p 4063 -h 127.0.0.1
+Ice.Default.Router=OMERO.Glacier2/router:tcp -p 4063 -h mage.openmicroscopy.org.uk
 omero.user=user
 omero.pass=CHANGE_ME
@@ -46 +46 @@
 # The following properties are useful when starting server via twistd
 # or directly via java -jar and is not intended for use with IceGrid.
-BlitzAdapter.Endpoints=tcp -h 127.0.0.1 -p 9999
-StatusCheck=BlitzManager:tcp -h 127.0.0.1 -p 9999
+BlitzAdapter.Endpoints=tcp -h mage.openmicroscopy.org.uk -p 9999
+StatusCheck=BlitzManager:tcp -h mage.openmicroscopy.org.uk -p 9999
 StatusCheck.Router=""

trunk/components/blitz/src/omero/util/IceMapper.java

@@ -700 +700 @@
         return false;
     }
+    
+    protected boolean isNullablePrimitive(Class<?> p) {
+        if (p.equals(Integer.class) || p.equals(Integer[].class)
+                || p.equals(Long.class) || p.equals(Long[].class)
+                || p.equals(Float.class) || p.equals(Float[].class)
+                || p.equals(Double.class) || p.equals(Double[].class)
+                || p.equals(Boolean.class) || p.equals(Boolean[].class)) {
+            return true;
+        }
+        return false;
+    }
 
     protected boolean isWrapperArray(Class<?> p) {
@@ -714 +725 @@
             RType rt = (RType) arg;
             return fromRType(rt);
-        } else if (isPrimitive(p)) { // FIXME use findTarget for Immutable.
+        } else if (isPrimitive(p) || isNullablePrimitive(p)) {
+            // FIXME use findTarget for Immutable.
             return arg;
         } else if (isWrapperArray(p)) {
@@ -761 +773 @@
         } else if (isPrimitive(type)) {
             return o;
-        } else if (Boolean.class.isAssignableFrom(type)
-                   || Integer.class.isAssignableFrom(type)
-                   || Long.class.isAssignableFrom(type)
-                   || Double.class.isAssignableFrom(type)
-                   || Float.class.isAssignableFrom(type)
-                   || String.class.isAssignableFrom(type)) {
+        } else if (isNullablePrimitive(type)) {
             return toRType(o);
         } else if (RGBBuffer.class.isAssignableFrom(type)) {