You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2015/02/23 16:02:09 UTC
incubator-taverna-language git commit: Changed to deal with thread
safety
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 83e775231 -> bdf5bd306
Changed to deal with thread safety
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/bdf5bd30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/bdf5bd30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/bdf5bd30
Branch: refs/heads/master
Commit: bdf5bd30623ae150ebc8f158456edc301cd15af8
Parents: 83e7752
Author: Alan R Williams <al...@manchester.ac.uk>
Authored: Mon Feb 23 14:53:27 2015 +0000
Committer: Alan R Williams <al...@manchester.ac.uk>
Committed: Mon Feb 23 14:53:27 2015 +0000
----------------------------------------------------------------------
.../org/apache/taverna/baclava/BaclavaReader.java | 14 ++++++++++----
.../org/apache/taverna/baclava/BaclavaWriter.java | 11 ++++++++++-
2 files changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bdf5bd30/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
index 8b78826..af4d547 100644
--- a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
+++ b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaReader.java
@@ -30,12 +30,18 @@ import javax.xml.bind.Unmarshaller;
public class BaclavaReader {
- private static JAXBContext jaxbContext;
- private static Unmarshaller unmarshaller;
+ private static final JAXBContext jaxbContext = initContext();
+
+ private static JAXBContext initContext() {
+ try {
+ return JAXBContext.newInstance("org.apache.taverna.baclava");
+ } catch (JAXBException e) {
+ return null;
+ }
+ }
public static DataThingMapType readBaclava(Reader r) throws JAXBException {
- jaxbContext = JAXBContext.newInstance("org.apache.taverna.baclava");
- unmarshaller = jaxbContext.createUnmarshaller();
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
JAXBElement<?> jb = (JAXBElement<?>) unmarshaller.unmarshal(r);
return (DataThingMapType) jb.getValue();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/bdf5bd30/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
index cf8917d..ad2741f 100644
--- a/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
+++ b/taverna-baclava-language/src/main/java/org/apache/taverna/baclava/BaclavaWriter.java
@@ -34,9 +34,18 @@ import javax.xml.bind.Marshaller;
*
*/
public class BaclavaWriter {
+
+ private static final JAXBContext jaxbContext = initContext();
+
+ private static JAXBContext initContext() {
+ try {
+ return JAXBContext.newInstance("org.apache.taverna.baclava");
+ } catch (JAXBException e) {
+ return null;
+ }
+ }
public static void writeBaclava(DataThingMapType d, Writer w) throws JAXBException {
- JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", true);