From 35c4eac150a4fcb3b59b3fda7e8b7edf87eb9807 Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Fri, 11 Sep 2020 23:08:30 +0800
Subject: [PATCH] Upgrade the version to be 2.2.2.RELEASE

---
 pom.xml                                       |  2 +-
 spring-cloud-alibaba-dependencies/pom.xml     |  2 +-
 .../asciidoc-zh/dependency-management.adoc    |  2 +-
 .../main/asciidoc/dependency-management.adoc  |  2 +-
 .../seata/web/SeataHandlerInterceptor.java    | 71 ++++++++++---------
 5 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13b06fdd..64b45518 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
 
     <properties>
         <!-- Project revision -->
-        <revision>2.2.2-SNAPSHOT</revision>
+        <revision>2.2.2.RELEASE</revision>
 
         <!-- Dependency Versions -->
         <spring-cloud-commons.version>2.2.5.RELEASE</spring-cloud-commons.version>
diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 222576d8..7a1870ce 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,7 +18,7 @@
     <description>Spring Cloud Alibaba Dependencies</description>
 
     <properties>
-        <revision>2.2.2-SNAPSHOT</revision>
+        <revision>2.2.2.RELEASE</revision>
         <sentinel.version>1.8.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <seata.version>1.3.0</seata.version>
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc
index 834bf75c..5a3dc333 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc
@@ -10,7 +10,7 @@ Spring Cloud Alibaba BOM 包含了它所使用的所有依赖的版本。
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>2.2.2.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc
index ee22c0e4..789d1aed 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc
@@ -8,7 +8,7 @@ If you’re a Maven Central user, add our BOM to your pom.xml <dependencyManagem
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-            <version>2.2.0.RELEASE</version>
+            <version>2.2.2.RELEASE</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
index 86d331b0..f7ec7659 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
@@ -41,45 +41,46 @@ public class SeataHandlerInterceptor implements HandlerInterceptor {
 			.getLogger(SeataHandlerInterceptor.class);
 
 	@Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
-        String xid = RootContext.getXID();
-        String rpcXid = request.getHeader(RootContext.KEY_XID);
-        if (log.isDebugEnabled()) {
-            log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid);
-        }
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
+			Object handler) {
+		String xid = RootContext.getXID();
+		String rpcXid = request.getHeader(RootContext.KEY_XID);
+		if (log.isDebugEnabled()) {
+			log.debug("xid in RootContext {} xid in RpcContext {}", xid, rpcXid);
+		}
 
-        if (StringUtils.isBlank(xid) && rpcXid != null) {
-            RootContext.bind(rpcXid);
-            if (log.isDebugEnabled()) {
-                log.debug("bind {} to RootContext", rpcXid);
-            }
-        }
+		if (StringUtils.isBlank(xid) && rpcXid != null) {
+			RootContext.bind(rpcXid);
+			if (log.isDebugEnabled()) {
+				log.debug("bind {} to RootContext", rpcXid);
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
+			Object handler, Exception e) {
+		if (StringUtils.isNotBlank(RootContext.getXID())) {
+			String rpcXid = request.getHeader(RootContext.KEY_XID);
 
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception e) {
-        if (StringUtils.isNotBlank(RootContext.getXID())) {
-            String rpcXid = request.getHeader(RootContext.KEY_XID);
+			if (StringUtils.isEmpty(rpcXid)) {
+				return;
+			}
 
-            if (StringUtils.isEmpty(rpcXid)) {
-                return;
-            }
-
-            String unbindXid = RootContext.unbind();
-            if (log.isDebugEnabled()) {
-                log.debug("unbind {} from RootContext", unbindXid);
-            }
-            if (!rpcXid.equalsIgnoreCase(unbindXid)) {
-                log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
-                if (unbindXid != null) {
-                    RootContext.bind(unbindXid);
-                    log.warn("bind {} back to RootContext", unbindXid);
-                }
-            }
-        }
-    }
+			String unbindXid = RootContext.unbind();
+			if (log.isDebugEnabled()) {
+				log.debug("unbind {} from RootContext", unbindXid);
+			}
+			if (!rpcXid.equalsIgnoreCase(unbindXid)) {
+				log.warn("xid in change during RPC from {} to {}", rpcXid, unbindXid);
+				if (unbindXid != null) {
+					RootContext.bind(unbindXid);
+					log.warn("bind {} back to RootContext", unbindXid);
+				}
+			}
+		}
+	}
 
 }