Index: third_party/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs |
diff --git a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto b/third_party/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs |
similarity index 61% |
copy from third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto |
copy to third_party/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs |
index df98ac4bd1929fda636c9e2fce1a9184ebf5d472..b54342014215e5f85c014da617b39978f37fd8d9 100644 |
--- a/third_party/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs |
@@ -1,6 +1,7 @@ |
+#region Copyright notice and license |
// Protocol Buffers - Google's data interchange format |
-// Copyright 2008 Google Inc. All rights reserved. |
-// http://code.google.com/p/protobuf/ |
+// Copyright 2015 Google Inc. All rights reserved. |
+// https://developers.google.com/protocol-buffers/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -27,23 +28,26 @@ |
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+#endregion |
-// Author: jasonh@google.com (Jason Hsueh) |
-// |
-// This file is used to test a corner case in the CPP implementation where the |
-// generated C++ type is available for the extendee, but the extension is |
-// defined in a file whose C++ type is not in the binary. |
- |
- |
-import "google/protobuf/internal/more_extensions.proto"; |
- |
-package google.protobuf.internal; |
- |
-message DynamicMessageType { |
- optional int32 a = 1; |
-} |
+using System.IO; |
-extend ExtendedMessage { |
- optional int32 dynamic_int32_extension = 100; |
- optional DynamicMessageType dynamic_message_extension = 101; |
-} |
+namespace Google.Protobuf |
+{ |
+ /// <summary> |
+ /// Thrown when an attempt is made to parse invalid JSON, e.g. using |
+ /// a non-string property key, or including a redundant comma. Parsing a protocol buffer |
+ /// message represented in JSON using <see cref="JsonParser"/> can throw both this |
+ /// exception and <see cref="InvalidProtocolBufferException"/> depending on the situation. This |
+ /// exception is only thrown for "pure JSON" errors, whereas <c>InvalidProtocolBufferException</c> |
+ /// is thrown when the JSON may be valid in and of itself, but cannot be parsed as a protocol buffer |
+ /// message. |
+ /// </summary> |
+ public sealed class InvalidJsonException : IOException |
+ { |
+ internal InvalidJsonException(string message) |
+ : base(message) |
+ { |
+ } |
+ } |
+} |