Skip to content

Commit

Permalink
Improved: Use ‘FlexibleLocation#resolveLocation(String)’ when possibl…
Browse files Browse the repository at this point in the history
…e (OFBIZ-10821)

Previously the artifact info classes were using the
‘FlexibleLocation#resolveLocation(String, ClassLoader)’ method by
passing ‘null’ as the second argument which is equivalent to calling
the more specific ‘FlexibleLocation#resolveLocation(String)’ method
with the same first argument.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1854667 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
mthl committed Mar 2, 2019
1 parent 10891b6 commit 4fbb189
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Expand Up @@ -84,7 +84,7 @@ public String getUniqueId() {

@Override
public URL getLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.modelEntity.getLocation(), null);
return FlexibleLocation.resolveLocation(modelEntity.getLocation());
}

@Override
Expand Down
Expand Up @@ -205,7 +205,7 @@ public String getUniqueId() {

@Override
public URL getLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.formLocation, null);
return FlexibleLocation.resolveLocation(formLocation);
}

@Override
Expand Down
Expand Up @@ -184,7 +184,7 @@ public String getUniqueId() {

@Override
public URL getLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.screenLocation, null);
return FlexibleLocation.resolveLocation(screenLocation);
}

@Override
Expand Down
Expand Up @@ -262,11 +262,11 @@ public String getUniqueId() {

@Override
public URL getLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.modelService.definitionLocation, null);
return FlexibleLocation.resolveLocation(modelService.definitionLocation);
}

public URL getImplementationLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.modelService.location, null);
return FlexibleLocation.resolveLocation(modelService.location);
}

public Set<EntityArtifactInfo> getEntitiesUsedByService() {
Expand Down
Expand Up @@ -85,7 +85,7 @@ public String getUniqueId() {

@Override
public URL getLocationURL() throws MalformedURLException {
return FlexibleLocation.resolveLocation(this.serviceEcaRule.getDefinitionLocation(), null);
return FlexibleLocation.resolveLocation(serviceEcaRule.getDefinitionLocation());
}

public ServiceEcaRule getServiceEcaRule() {
Expand Down

0 comments on commit 4fbb189

Please sign in to comment.