Changeset 32345 for main/trunk/greenstone2

Timestamp:

2018-08-17T21:57:56+12:00 (6 years ago)

Author:

ak19

Message:

util.pm has to cope with library url being undefined: it can happen if the build.props properties are invalid or inconsistent (port numbers, inconsistency between enabled port properties and server.protocol, missing keystore password if https is enabled)

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -1403 +1403 @@
         close(PIN);
         
-        if (defined $lib_name) { # url won't be undef now
+        # url can be undef if tomcat.port could not be determined due to
+        # user having wrong or conflicting server related vals in build.props
+           if (defined $url && defined $lib_name) {
             # replace the servlet_name portion of the url found, with the given library_name
             $url =~ s@/[^/]*$@/$lib_name@;