Changeset 2192

Show
Ignore:
Timestamp:
08/21/2008 10:27:02 AM (1 year ago)
Author:
brian
Message:

Added some logging to try and catch the Solaris bug; fixed the protocol info.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dCacheNebraska/dcache-httpDoor.spec

    r2190 r2192  
    11%define name dcache-httpDoor 
    22%define version 0.2.1 
    3 %define release 1 
     3%define release 3 
    44 
    55Summary: HTTP door for dCache 

  • dCacheNebraska/java_src/diskCacheV111/movers/HttpProtocol_1.java

    r2109 r2192  
    2929import diskCacheV111.repository.SpaceMonitor; 
    3030import diskCacheV111.util.PnfsId; 
     31import diskCacheV111.util.CacheException; 
    3132import diskCacheV111.vehicles.ProtocolInfo; 
    3233import diskCacheV111.vehicles.StorageInfo; 
    …… 
    139140                        StorageInfo storage, PnfsId pnfsId, SpaceMonitor spaceMonitor, 
    140141                        int access) throws Exception { 
    141                 // TODO Auto-generated method stub 
    142                 HttpProtocolInfo hpi = (HttpProtocolInfo)protocol; 
     142                HttpProtocolInfo hpi = null; 
     143                try { 
     144                        hpi = (HttpProtocolInfo)protocol; 
     145                } catch (ClassCastException cce) { 
     146                        log.error(cce); 
     147                        log.error(protocol.toString()); 
     148                        log.error(protocol.getClass().getCanonicalName()); 
     149                        throw new CacheException(44, "protocol info not HttpProtocolInfo."); 
     150                } 
    143151                token = hpi.getToken(); 
    144152        //CacheRepository repos = (CacheRepository) spaceMonitor; 

  • dCacheNebraska/java_src/edu/unl/dCache/vehicles/HttpProtocolInfo.java

    r1435 r2192  
    5050 
    5151        public String getVersionString() { 
    52                 return _major + "." + _minor; 
     52                return _protocol + "-" + _major + "." + _minor; 
    5353        } 
    5454