diff --git a/pom.xml b/pom.xml index 3d90876a1b874bd83c01bb3137942b001c9f9896..f5d987b2779347151b2b7a51ea8794b45516d05d 100755 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-spatial</artifactId> - <version>5.3.8.Final</version> + <version>5.3.9.Final</version> <exclusions> <exclusion> <artifactId>postgresql</artifactId> @@ -168,7 +168,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>5.3.8.Final</version> + <version>5.3.9.Final</version> <scope>provided</scope> </dependency> <dependency> diff --git a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java index a9713273a57fa8a444b67a9f67e5c72a952458ed..7af5806bb1116c6b97b22f544565932f7216f3b2 100755 --- a/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java @@ -50,6 +50,7 @@ import javax.persistence.EntityManager; import javax.persistence.NoResultException; import javax.persistence.PersistenceContext; import javax.persistence.Query; +import javax.ws.rs.ProcessingException; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; @@ -597,19 +598,19 @@ public class ForecastBean { { ex.printStackTrace(); }*/ - Response resp = this.getManagerResource().runModel(config.getModelId(), request); - if(resp.getStatus() == Response.Status.OK.getStatusCode()) - { - //System.out.println(resp.readEntity(String.class)); - List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){}); - //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size()); - // We delete all former results before we store the new ones - SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results); - } - else - { - throw new RunModelException(resp.readEntity(String.class)); - } + Response resp = this.getManagerResource().runModel(config.getModelId(), request); + if(resp.getStatus() == Response.Status.OK.getStatusCode()) + { + //System.out.println(resp.readEntity(String.class)); + List<Result> results = (List<Result>) resp.readEntity(new GenericType<List<Result>>(){}); + //System.out.println("ForecastConfigId=" + forecastConfiguration.getForecastConfigurationId() + ", resultsize=" + results.size()); + // We delete all former results before we store the new ones + SessionControllerGetter.getForecastBean().storeResults(forecastConfiguration,results); + } + else + { + throw new RunModelException(resp.readEntity(String.class)); + } //System.out.println("Finished runModel for wsId" + forecastConfiguration.getWeatherStationPointOfInterestId()); } diff --git a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml index 2414fddc3825844264d75cfabebf6b93be5c56a5..9c3a1bfd37e061eeb0c7753213b3b363167cecae 100755 --- a/src/main/webapp/WEB-INF/jboss-deployment-structure.xml +++ b/src/main/webapp/WEB-INF/jboss-deployment-structure.xml @@ -6,5 +6,8 @@ <module name="com.fasterxml.jackson.core.jackson-core" /> <module name="org.apache.httpcomponents" /> </dependencies> + <exclusions> + <module name="org.jboss.resteasy.resteasy-json-binding-provider"/> + </exclusions> </deployment> </jboss-deployment-structure> \ No newline at end of file