trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/2] trafficserver git commit: TS-3615 Move the validity assertion to the correct place
Date Wed, 20 May 2015 19:53:22 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 1dfd8c240 -> 5592ed98e


TS-3615 Move the validity assertion to the correct place


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/63c3d219
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/63c3d219
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/63c3d219

Branch: refs/heads/master
Commit: 63c3d219909c5a797f303a0e87f36dc1af789b19
Parents: 1dfd8c2
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Mon May 18 07:16:39 2015 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Wed May 20 13:52:20 2015 -0600

----------------------------------------------------------------------
 plugins/experimental/s3_auth/s3_auth.cc | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/63c3d219/plugins/experimental/s3_auth/s3_auth.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index e59621d..aec74f3 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -535,8 +535,8 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo * /* rri */)
 {
   S3Config *s3 = static_cast<S3Config *>(ih);
 
-  TSAssert(s3->valid());
   if (s3) {
+    TSAssert(s3->valid());
     // Now schedule the continuation to update the URL when going to origin.
     // Note that in most cases, this is a No-Op, assuming you have reasonable
     // cache hit ratio. However, the scheduling is next to free (very cheap).
@@ -552,19 +552,3 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo * /* rri
*/)
   // This plugin actually doesn't do anything with remapping. Ever.
   return TSREMAP_NO_REMAP;
 }
-
-
-/*
-  local variables:
-  mode: C++
-  indent-tabs-mode: nil
-  c-basic-offset: 2
-  c-comment-only-line-offset: 0
-  c-file-offsets: ((statement-block-intro . +)
-  (label . 0)
-  (statement-cont . +)
-  (innamespace . 0))
-  end:
-
-  Indent with: /usr/bin/indent -ncs -nut -npcs -l 120 logstats.cc
-*/


Mime
View raw message