From 543f8f5b932b22f1f63adc3f46ab0cb82d2373c9 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Thu, 5 Aug 2010 14:34:45 +0800
Subject: Cherry-pick the change from master for the setRPort in Via header.

Change-Id: Ib13825c94af0e4cfffbbb6ebc4ed264596b80c26
---
 java/gov/nist/javax/sip/header/Via.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/gov/nist/javax/sip/header/Via.java b/java/gov/nist/javax/sip/header/Via.java
index 2253394..be40962 100644
--- a/java/gov/nist/javax/sip/header/Via.java
+++ b/java/gov/nist/javax/sip/header/Via.java
@@ -96,6 +96,8 @@ public class Via
      */
     protected String comment;
 
+    private boolean rPortFlag = false;
+
     /** Default constructor
     */
     public Via() {
@@ -265,6 +267,7 @@ public class Via
         if (comment != null) {
             buffer.append(SP).append(LPAREN).append(comment).append(RPAREN);
         }
+        if (rPortFlag) buffer.append(";rport");
         return buffer;
     }
 
@@ -324,11 +327,7 @@ public class Via
      * Set the RPort flag parameter
      */
     public void setRPort(){
-        try {
-            this.setParameter(Via.RPORT,"");
-        } catch (ParseException e) {
-            e.printStackTrace();    // should not occur
-        }
+        rPortFlag = true;
     }
 
     /**
-- 
cgit v1.2.3


From 2b48b9a946dff3f11963e3f486f5eb71934c55d4 Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Fri, 6 Aug 2010 10:58:34 +0800
Subject: Fix the build.

Change-Id: I45517c7bd7944de69e645b5fac462cd15f9ee661
---
 java/gov/nist/core/LogWriter.java | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/java/gov/nist/core/LogWriter.java b/java/gov/nist/core/LogWriter.java
index afbb363..2f7994a 100644
--- a/java/gov/nist/core/LogWriter.java
+++ b/java/gov/nist/core/LogWriter.java
@@ -26,7 +26,6 @@
  ***************************************************************************/
 package gov.nist.core;
 
-import android.util.Log;
 import java.io.*;
 import java.util.Properties;
 
@@ -40,29 +39,29 @@ public class LogWriter implements StackLogger {
     public void logStackTrace() {
         // TODO
     }
-    
+
     public void logStackTrace(int traceLevel) {
         // TODO
     }
-    
+
     public int getLineCount() {
         return 0;
     }
-    
+
     public void logException(Throwable ex) {
-        Log.e(TAG, "", ex);
+        //Log.e(TAG, "", ex);
     }
     public void logDebug(String message) {
-        Log.d(TAG, message);
+        //Log.d(TAG, message);
     }
     public void logTrace(String message) {
-        Log.d(TAG, message);
+        //Log.d(TAG, message);
     }
     public void logFatalError(String message) {
-        Log.e(TAG, message);
+        //Log.e(TAG, message);
     }
     public void logError(String message) {
-        Log.e(TAG, message);
+        //Log.e(TAG, message);
     }
     public boolean isLoggingEnabled() {
         return mEnabled;
@@ -72,15 +71,15 @@ public class LogWriter implements StackLogger {
         return mEnabled;
     }
     public void logError(String message, Exception ex) {
-        Log.e(TAG, message, ex);
+        //Log.e(TAG, message, ex);
     }
     public void logWarning(String string) {
-        Log.w(TAG, string);
+        //Log.w(TAG, string);
     }
     public void logInfo(String string) {
-        Log.i(TAG, string);
+        //Log.i(TAG, string);
     }
-    
+
     public void disableLogging() {
         mEnabled = false;
     }
@@ -88,13 +87,13 @@ public class LogWriter implements StackLogger {
     public void enableLogging() {
         mEnabled = true;
     }
-    
+
     public void setBuildTimeStamp(String buildTimeStamp) {
     }
-     
+
     public void setStackProperties(Properties stackProperties) {
     }
-    
+
     public String getLoggerName() {
         return "Android SIP Logger";
     }
@@ -592,4 +591,3 @@ public class LogWriter implements StackLogger {
 //}
 
 // END android-deleted
-
-- 
cgit v1.2.3