Project

General

Profile

« Previous | Next » 

Revision 9161

use secure context url for loading XSLTs in db transform

View differences:

src/edu/ucsb/nceas/metacat/DBTransform.java
89 89
  {
90 90
    configDir = SystemUtil.getStyleSkinsDir();
91 91
    defaultStyle = PropertyService.getProperty("application.default-style");
92
    httpServer = SystemUtil.getServerURL();
93
    contextURL = SystemUtil.getContextURL();
92
    httpServer = SystemUtil.getSecureServerURL();
93
    contextURL = SystemUtil.getSecureContextURL();
94 94
    servletURL = SystemUtil.getServletURL();
95 95
    userManagementURL = PropertyService.getProperty("auth.userManagementUrl");
96 96
  }
......
353 353
    }
354 354
    
355 355
    //Check if the systemId is relative path, add a postfix - the contextULR to systemID. 
356
    if (systemId != null && systemId.indexOf("http://" ) == -1)
356
    if (systemId != null && !systemId.startsWith("http"))
357 357
    {
358 358
    	systemId = contextURL+systemId;
359 359
    }

Also available in: Unified diff