From 16d67e508b953fe06b52356bf29f3a33ff1e3884 Mon Sep 17 00:00:00 2001
From: Carl Harris <ceharris@vt.edu>
Date: Sun, 28 Apr 2013 09:54:44 -0400
Subject: [PATCH] modified concrete appenders to use appropriate constructors

Mutable fields in SocketAppenderBase were previously exposed as
protected fields and modified by constructors in concrete subclasses.
This commit improves encapsulation of the base class by exposing
protected constructors for subclasses to invoke rather than directly
exposing the fields.  These new constructors are marked as deprecated,
as the convenience constructors on the base classes (which are also
deprecated) are the sole reason for their existence.  A future release
should remove all but the no-arg constructor from the base class and
subclasses.
---
 .../logback/access/net/SSLSocketAppender.java    |  5 ++---
 .../qos/logback/access/net/SocketAppender.java   |  8 ++------
 .../logback/classic/net/SSLSocketAppender.java   |  5 ++---
 .../qos/logback/classic/net/SocketAppender.java  | 16 ++++++----------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java b/logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java
index ee2f1af453..258ebfd1aa 100644
--- a/logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java
+++ b/logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java
@@ -40,7 +40,7 @@ public SSLSocketAppender() {
    */
   @Deprecated
   public SSLSocketAppender(String host, int port) {
-    this(getAddressByName(host), port);
+    super(host, port);
   }
 
   /**
@@ -48,8 +48,7 @@ public SSLSocketAppender(String host, int port) {
    */
   @Deprecated
   public SSLSocketAppender(InetAddress address, int port) {
-    this.address = address;
-    this.port = port;
+    super(address.getHostAddress(), port);
   }
 
   @Override
diff --git a/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java b/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java
index e857675c20..ccfb24b095 100644
--- a/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java
+++ b/logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java
@@ -44,9 +44,7 @@ public SocketAppender() {
    */
   @Deprecated
   public SocketAppender(InetAddress address, int port) {
-    this.address = address;
-    this.remoteHost = address.getHostName();
-    this.port = port;
+    super(address.getHostAddress(), port);
   }
 
   /**
@@ -54,9 +52,7 @@ public SocketAppender(InetAddress address, int port) {
    */
   @Deprecated
   public SocketAppender(String host, int port) {
-    this.port = port;
-    this.address = getAddressByName(host);
-    this.remoteHost = host;
+    super(host, port);
   }
   
   @Override
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
index b424b20f4d..1881e39036 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java
@@ -42,7 +42,7 @@ public SSLSocketAppender() {
    */
   @Deprecated
   public SSLSocketAppender(String host, int port) {
-    this(getAddressByName(host), port);
+    super(host, port);
   }
 
   /**
@@ -50,8 +50,7 @@ public SSLSocketAppender(String host, int port) {
    */
   @Deprecated
   public SSLSocketAppender(InetAddress address, int port) {
-    this.address = address;
-    this.port = port;
+    super(address.getHostAddress(), port);
   }
 
   @Override
diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
index a7f9299bfd..1d39759c37 100644
--- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
+++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java
@@ -42,23 +42,19 @@ public SocketAppender() {
   }
 
   /**
-   * Connects to remote server at <code>address</code> and <code>port</code>.
+   * Connects to remote server at <code>host</code> and <code>port</code>.
    */
   @Deprecated
-  public SocketAppender(InetAddress address, int port) {
-    this.address = address;
-    this.remoteHost = address.getHostName();
-    this.port = port;
+  public SocketAppender(String host, int port) {
+    super(host, port);
   }
 
   /**
-   * Connects to remote server at <code>host</code> and <code>port</code>.
+   * Connects to remote server at <code>address</code> and <code>port</code>.
    */
   @Deprecated
-  public SocketAppender(String host, int port) {
-    this.port = port;
-    this.address = getAddressByName(host);
-    this.remoteHost = host;
+  public SocketAppender(InetAddress address, int port) {
+    super(address.getHostAddress(), port);
   }
 
   @Override