ISPN-841 add copyright headers, make the threadlocal private

infinispan · Jan 5, 2011 · c5b26f3 · c5b26f3
1 parent 8b6b868
commit c5b26f3
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 9 deletions.
diff --git a/tree/src/main/java/org/infinispan/tree/CacheAdapter.java b/tree/src/main/java/org/infinispan/tree/CacheAdapter.java
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.tree;
 
 import org.infinispan.AdvancedCache;

diff --git a/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java b/tree/src/main/java/org/infinispan/tree/LifecycleCallbacks.java
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.tree;
 
 import org.infinispan.config.GlobalConfiguration;

diff --git a/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java b/tree/src/main/java/org/infinispan/tree/TreeCacheFactory.java
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.tree;
 
 import org.infinispan.Cache;

diff --git a/tree/src/main/java/org/infinispan/tree/TreeContext.java b/tree/src/main/java/org/infinispan/tree/TreeContext.java
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.tree;
 
 import org.infinispan.context.Flag;

diff --git a/tree/src/main/java/org/infinispan/tree/TreeContextContainer.java b/tree/src/main/java/org/infinispan/tree/TreeContextContainer.java
@@ -1,3 +1,24 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2000 - 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.infinispan.tree;
 
 /**
@@ -9,7 +30,7 @@
  */
 public class TreeContextContainer {
 
-   ThreadLocal<TreeContext> tcTL = new ThreadLocal<TreeContext>();
+   private final ThreadLocal<TreeContext> tcTL = new ThreadLocal<TreeContext>();
 
    public TreeContext createTreeContext() {
       TreeContext existing = tcTL.get();

diff --git a/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java b/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
@@ -126,12 +126,4 @@ protected final <K, V> AtomicMap<K, V> getAtomicMap(NodeKey key) {
       return AtomicMapLookup.getAtomicMap(cache, key);
    }
 
-// This does not work cos code outside control of tree module will execute ops in cache, see CacheAdapter javadoc
-//
-//   protected final Cache<NodeKey, AtomicMap<?, ?>> withTreeFlags(Cache<NodeKey, AtomicMap<?, ?>> cache) {
-//      if (tcc.getTreeContext() != null)
-//         icc.createInvocationContext().setFlags(tcc.getTreeContext().getFlags());
-//      return cache;
-//   }
-//
 }