BIND 10 trac2426, updated. acb20abee749563f5de98d582825f29b39046f11 [2426] Update exception message

[BIND 10 source code commits]

The branch, trac2426 has been updated
       via  acb20abee749563f5de98d582825f29b39046f11 (commit)
       via  5c94286b3fcf47697829b2edba32cd47ed090bd6 (commit)
       via  1233aa6063c1790b69247fa96790651742d27c12 (commit)
      from  8ec8a19d2342170d7deb9ee771c157eb439bc278 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit acb20abee749563f5de98d582825f29b39046f11
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Feb 18 18:36:57 2014 +0530

    [2426] Update exception message

commit 5c94286b3fcf47697829b2edba32cd47ed090bd6
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Feb 18 18:33:27 2014 +0530

    [2426] Add a comment on why the ungetToken() is necessary

commit 1233aa6063c1790b69247fa96790651742d27c12
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Feb 18 18:25:25 2014 +0530

    [2426] Move the ungetToken() call to make it easier to follow

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/rdata.cc |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/rdata.cc b/src/lib/dns/rdata.cc
index bc0b403..4576b17 100644
--- a/src/lib/dns/rdata.cc
+++ b/src/lib/dns/rdata.cc
@@ -247,14 +247,16 @@ Generic::constructFromLexer(MasterLexer& lexer) {
                 lexer.getNextToken(MasterToken::STRING, true);
             if ((token.getType() == MasterToken::END_OF_FILE) ||
                 (token.getType() == MasterToken::END_OF_LINE)) {
+                // Unget the last read token as createRdata() expects us
+                // to leave it at the end-of-line or end-of-file when we
+                // return.
+                lexer.ungetToken();
                 break;
             }
             token.getString(hex_part);
             hex_txt.append(hex_part);
         }
 
-        lexer.ungetToken();
-
         try {
             isc::util::encode::decodeHex(hex_txt, data);
         } catch (const isc::BadValue& ex) {
@@ -265,7 +267,7 @@ Generic::constructFromLexer(MasterLexer& lexer) {
 
     if (data.size() != rdlen) {
         isc_throw(InvalidRdataLength,
-                  "Unknown RDATA hex data doesn't match RDLENGTH: "
+                  "Size of unknown RDATA hex data doesn't match RDLENGTH: "
                   << data.size() << " vs. " << rdlen);
     }