From f92d4fa20f0792f2533d7f7a65a295bc26bfa062 Mon Sep 17 00:00:00 2001
From: Tsuyoshi Ozawa <ozawa@apache.org>
Date: Thu, 5 Feb 2015 00:42:14 +0900
Subject: [PATCH] HADOOP-11546. Checkstyle failing: Unable to instantiate
 DoubleCheckedLockingCheck. (ozawa)

(cherry picked from commit ba58da29f49da15f7eb6300f996e0ae7ba9d0d1e)
---
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 hadoop-common-project/hadoop-common/dev-support/checkstyle.xml | 1 -
 hadoop-hdfs-project/hadoop-hdfs/dev-support/checkstyle.xml     | 1 -
 hadoop-tools/hadoop-azure/src/config/checkstyle.xml            | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 021c75428ce..736ce61bbcb 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -470,6 +470,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11529. Fix findbugs warnings in hadoop-archives.
     (Masatake Iwasaki via wheat9)
 
+    HADOOP-11546. Checkstyle failing: Unable to instantiate 
+    DoubleCheckedLockingCheck. (ozawa)
+
 Release 2.6.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-common-project/hadoop-common/dev-support/checkstyle.xml b/hadoop-common-project/hadoop-common/dev-support/checkstyle.xml
index ad70bee1764..4caa03f05df 100644
--- a/hadoop-common-project/hadoop-common/dev-support/checkstyle.xml
+++ b/hadoop-common-project/hadoop-common/dev-support/checkstyle.xml
@@ -150,7 +150,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <!-- module name="AvoidInlineConditionals"/-->
-        <module name="DoubleCheckedLocking"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/checkstyle.xml b/hadoop-hdfs-project/hadoop-hdfs/dev-support/checkstyle.xml
index 5b25fe2cb5a..eda4a471636 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/dev-support/checkstyle.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/checkstyle.xml
@@ -134,7 +134,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <!-- module name="AvoidInlineConditionals"/-->
-        <module name="DoubleCheckedLocking"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="HiddenField">
diff --git a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
index 9df4f78bcc0..f68f6c82089 100644
--- a/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
+++ b/hadoop-tools/hadoop-azure/src/config/checkstyle.xml
@@ -147,7 +147,6 @@
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
         <!-- <module name="AvoidInlineConditionals"/> -->
-        <!-- <module name="DoubleCheckedLocking"/> -->
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <!-- <module name="HiddenField"/> -->