Changeset 358

Show
Ignore:
Timestamp:
03/27/06 19:38:31 (3 years ago)
Author:
alban
Message:

[Bug 65] fix config test to ignore urls, fix FileResourceLocator? to avoid problem with invalide file: url

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/debian/freecast.init.template

    r1 r358  
    2828test -f $DAEMON || exit 0 
    2929if [ -n "$CONFIG" ]; then 
    30         if [ ! -f $CONFIG ]; then  
     30        echo $CONFIG | egrep "^http:|^file" > /dev/null 2>&1 && CONFIG_URL=true 
     31        # we can't check urls 
     32         
     33        if [ "$CONFIG_URL" != "true" && ! -f $CONFIG ]; then  
    3134                echo "The specified configuration file doesn't exist ($CONFIG)." 
    3235                echo "See configuration samples into /usr/share/doc/freecast." 
  • trunk/source/org/kolaka/freecast/resource/FileResourceLocator.java

    r251 r358  
    5555                if (uri.getScheme() != null) { 
    5656                        ResourceLocator.MalformedURIException.checkScheme(uri, "file"); 
     57                } 
     58                if (uri.getPath() == null) { 
     59                        throw new ResourceLocator.UnavailableResourceException(uri); 
    5760                } 
    5861