minor diffs

Author: mrkraimer

pvDataJava/README.md

@@ -1,46 +1 @@
-<<<<<<< HEAD
-pvaDataJava
-==========
-
-pvDataJava is a set of data types and utilities that form part of the EPICS V4 project.
-
-
-Further Info
-------------
-
-Consult the documents in the documentation directory, in particular
-
-* pvDataJava.html
-* RELEASE_NOTES.md
-
-Also see the [EPICS Version 4 website](http://epics-pvdata.sourceforge.net)
-
-
-Building
---------
-
-Building from the source module requires maven.
-
-To build type
-
-    mvn compile install
-
-To clean
-
-    mvn clean
-
-Building the module will generate jars of the .class files, the source
-and the javadoc.
-
-To unzip the a jar, for example the javadoc jar, type
-
-    java xf <name-of-jar>
-e.g.
-
-    java xf pvDataJava-0.2.0-SNAPSHOT-javadoc.jar
-
-from the directory containing the jar.
-
-=======
 # pvDataJava [![Build Status](https://travis-ci.org/epics-base/pvDataJava.svg?branch=master)](https://travis-ci.org/epics-base/pvDataJava)
->>>>>>> 81ade9b8f2fdbfc1c12b415154e9b7808a35dc1a

pvDataJava/src/org/epics/pvdata/copy/PVCopyFactory.java

@@ -1,5 +1,5 @@
 /*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
+ * License terms for this software can be found in the file LICENSE that is included with the distribution
  */
 package org.epics.pvdata.copy;
 
@@ -11,7 +11,6 @@
  *
  */
 public class PVCopyFactory {
-    private static boolean firstTime = true;
     /**
      * Map a subset of the fields within a PVRecord.
      * @param pvMaster The master PVStructure.
@@ -22,9 +21,6 @@ public class PVCopyFactory {
      * @return The PVCopy interface.
      */
     public static PVCopy create(PVStructure pvMaster,PVStructure pvRequest,String structureName) {
-        if(firstTime) {
-            firstTime = false;
-        }
-        return PVCopyImpl.create(pvMaster, pvRequest,structureName);
+    	return PVCopyImpl.create(pvMaster, pvRequest,structureName);
     }
 }