X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FLockable.cpp;h=18d78b603b335409088f18986ddb2fe1c8666cf8;hb=40ff57416ecfa4a04ae62f315d62d7fd743d4320;hp=4d9c5a4f83825799b7f22bc55cef66ad6c81989f;hpb=bd026f07e729e66127b3efd48aee443fba815af3;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/Lockable.cpp b/xmltooling/Lockable.cpp
index 4d9c5a4..18d78b6 100644
--- a/xmltooling/Lockable.cpp
+++ b/xmltooling/Lockable.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2009 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -36,20 +40,20 @@ Lockable::~Lockable()
 Locker::Locker(Lockable* lockee, bool lock)
 {
     if (lockee && lock)
-        m_lockee=lockee->lock();
+        m_lockee = lockee->lock();
     else
-        m_lockee=lockee;
+        m_lockee = lockee;
 }
 
 void Locker::assign(Lockable* lockee, bool lock)
 {
     if (m_lockee)
         m_lockee->unlock();
-    m_lockee=NULL;
+    m_lockee = nullptr;
     if (lockee && lock)
-        m_lockee=lockee->lock();
+        m_lockee = lockee->lock();
     else
-        m_lockee=lockee;
+        m_lockee = lockee;
 }
 
 Locker::~Locker()