Catch all exceptions from MarkdownPapers and rethrow as ParseException (issue 142)

diff --git a/docs/04_releases.mkd b/docs/04_releases.mkd
index ffd56ddcbc596b64d1f0b9896e0c7fbb590fa9cf..55bdfd71022efa46d90d9b9d87ab9ba18182910b 100644 (file)
--- a/docs/04_releases.mkd
+++ b/docs/04_releases.mkd
@@ -11,6 +11,7 @@ If you are updating from an earlier release AND you have indexed branches with t
 \r
 #### fixes\r
 \r
+- Wrapped Markdown parser with improved exception handler (issue 142)\r
 - Fixed duplicate entries in repository cache (issue 140)\r
 - Fixed connection leak in LDAPUserService (issue 139)\r
 - Fixed bug in commit page where changes to a submodule threw a null pointer exception (issue 132)\r

diff --git a/src/com/gitblit/utils/MarkdownUtils.java b/src/com/gitblit/utils/MarkdownUtils.java
index 828225db06b8063a3d1ae6b3180c6e6eee740905..0b8c9c5716e06872456e2290f32b46eb29672bfd 100644 (file)
--- a/src/com/gitblit/utils/MarkdownUtils.java
+++ b/src/com/gitblit/utils/MarkdownUtils.java
@@ -67,9 +67,15 @@ public class MarkdownUtils {
                        Markdown md = new Markdown();\r
                        md.transform(markdownReader, writer);\r
                        return writer.toString().trim();\r
+               } catch (StringIndexOutOfBoundsException e) {\r
+                       LoggerFactory.getLogger(MarkdownUtils.class).error("MarkdownPapers failed to parse Markdown!", e);\r
+                       throw new java.text.ParseException(e.getMessage(), 0);\r
                } catch (ParseException p) {\r
                        LoggerFactory.getLogger(MarkdownUtils.class).error("MarkdownPapers failed to parse Markdown!", p);\r
                        throw new java.text.ParseException(p.getMessage(), 0);\r
+               } catch (Exception e) {\r
+                       LoggerFactory.getLogger(MarkdownUtils.class).error("MarkdownPapers failed to parse Markdown!", e);\r
+                       throw new java.text.ParseException(e.getMessage(), 0);\r
                } finally {\r
                        try {\r
                                writer.close();\r