1.1 --- a/firethorn-ogsadai/activity/context/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/context/RequestContextFactory.java	Thu Jul 18 14:07:00 2019 +0300
     1.2 +++ b/firethorn-ogsadai/activity/context/src/main/java/uk/ac/roe/wfau/firethorn/ogsadai/context/RequestContextFactory.java	Thu Jul 18 17:43:12 2019 +0300
     1.3 @@ -64,8 +64,8 @@
     1.4          log.debug("remote [" + remote + "]");
     1.5  
     1.6          return new RequestContext()
     1.7 -			{
     1.8 -			private EndpointBuilder builder = new EndpointBuilder()
     1.9 +	    {
    1.10 +	    private EndpointBuilder builder = new EndpointBuilder()
    1.11                  {
    1.12                  private String protocol = DEFAULT_PROTOCOL;
    1.13                  @Override
    1.14 @@ -78,12 +78,8 @@
    1.15                      {
    1.16                      this.protocol = protocol;
    1.17                      }
    1.18 -                
    1.19 -                private String host = (remote != null) ? remote : DEFAULT_HOST ;
    1.20 -                if (System.getenv("firethornhost") != null) {
    1.21 -                    host = System.getenv("firethornhost").trim();
    1.22 -                } 
    1.23  
    1.24 +                private String host =(System.getenv("firethornhost") != null) ? System.getenv("firethornhost") : (remote != null) ? remote : DEFAULT_HOST ;
    1.25                  @Override
    1.26                  public String host()
    1.27                      {