File tree Expand file tree Collapse file tree 4 files changed +40
-40
lines changed
sentry-samples-netflix-dgs
sentry-samples-spring-boot-opentelemetry-noagent
sentry-samples-spring-boot-opentelemetry
sentry-samples-spring-boot-webflux Expand file tree Collapse file tree 4 files changed +40
-40
lines changed Original file line number Diff line number Diff line change @@ -59,18 +59,18 @@ val mergeSpringMetadata by
5959 filesToMerge.forEach { fileName ->
6060 val merged = StringBuilder ()
6161 classpathJars.forEach { jar ->
62- try {
63- val zip = ZipFile (jar)
64- val entry = zip.getEntry(" META-INF/$fileName " )
65- if (entry != null ) {
66- merged.append(zip.getInputStream(entry).bufferedReader().readText())
67- if (! merged.endsWith(" \n " )) merged.append(" \n " )
68- }
69- zip.close()
70- } catch (e: Exception ) {
71- /* skip non-zip files */
62+ try {
63+ val zip = ZipFile (jar)
64+ val entry = zip.getEntry(" META-INF/$fileName " )
65+ if (entry != null ) {
66+ merged.append(zip.getInputStream(entry).bufferedReader().readText())
67+ if (! merged.endsWith(" \n " )) merged.append(" \n " )
7268 }
69+ zip.close()
70+ } catch (e: Exception ) {
71+ /* skip non-zip files */
7372 }
73+ }
7474 if (merged.isNotEmpty()) {
7575 File (out , fileName).writeText(merged.toString())
7676 }
Original file line number Diff line number Diff line change @@ -100,18 +100,18 @@ val mergeSpringMetadata by
100100 filesToMerge.forEach { fileName ->
101101 val merged = StringBuilder ()
102102 classpathJars.forEach { jar ->
103- try {
104- val zip = ZipFile (jar)
105- val entry = zip.getEntry(" META-INF/$fileName " )
106- if (entry != null ) {
107- merged.append(zip.getInputStream(entry).bufferedReader().readText())
108- if (! merged.endsWith(" \n " )) merged.append(" \n " )
109- }
110- zip.close()
111- } catch (e: Exception ) {
112- /* skip non-zip files */
103+ try {
104+ val zip = ZipFile (jar)
105+ val entry = zip.getEntry(" META-INF/$fileName " )
106+ if (entry != null ) {
107+ merged.append(zip.getInputStream(entry).bufferedReader().readText())
108+ if (! merged.endsWith(" \n " )) merged.append(" \n " )
113109 }
110+ zip.close()
111+ } catch (e: Exception ) {
112+ /* skip non-zip files */
114113 }
114+ }
115115 if (merged.isNotEmpty()) {
116116 File (out , fileName).writeText(merged.toString())
117117 }
Original file line number Diff line number Diff line change @@ -96,18 +96,18 @@ val mergeSpringMetadata by
9696 filesToMerge.forEach { fileName ->
9797 val merged = StringBuilder ()
9898 classpathJars.forEach { jar ->
99- try {
100- val zip = ZipFile (jar)
101- val entry = zip.getEntry(" META-INF/$fileName " )
102- if (entry != null ) {
103- merged.append(zip.getInputStream(entry).bufferedReader().readText())
104- if (! merged.endsWith(" \n " )) merged.append(" \n " )
105- }
106- zip.close()
107- } catch (e: Exception ) {
108- /* skip non-zip files */
99+ try {
100+ val zip = ZipFile (jar)
101+ val entry = zip.getEntry(" META-INF/$fileName " )
102+ if (entry != null ) {
103+ merged.append(zip.getInputStream(entry).bufferedReader().readText())
104+ if (! merged.endsWith(" \n " )) merged.append(" \n " )
109105 }
106+ zip.close()
107+ } catch (e: Exception ) {
108+ /* skip non-zip files */
110109 }
110+ }
111111 if (merged.isNotEmpty()) {
112112 File (out , fileName).writeText(merged.toString())
113113 }
Original file line number Diff line number Diff line change @@ -69,18 +69,18 @@ val mergeSpringMetadata by
6969 filesToMerge.forEach { fileName ->
7070 val merged = StringBuilder ()
7171 classpathJars.forEach { jar ->
72- try {
73- val zip = ZipFile (jar)
74- val entry = zip.getEntry(" META-INF/$fileName " )
75- if (entry != null ) {
76- merged.append(zip.getInputStream(entry).bufferedReader().readText())
77- if (! merged.endsWith(" \n " )) merged.append(" \n " )
78- }
79- zip.close()
80- } catch (e: Exception ) {
81- /* skip non-zip files */
72+ try {
73+ val zip = ZipFile (jar)
74+ val entry = zip.getEntry(" META-INF/$fileName " )
75+ if (entry != null ) {
76+ merged.append(zip.getInputStream(entry).bufferedReader().readText())
77+ if (! merged.endsWith(" \n " )) merged.append(" \n " )
8278 }
79+ zip.close()
80+ } catch (e: Exception ) {
81+ /* skip non-zip files */
8382 }
83+ }
8484 if (merged.isNotEmpty()) {
8585 File (out , fileName).writeText(merged.toString())
8686 }
You can’t perform that action at this time.
0 commit comments