Browse Source

Use Any? in ProceedingJoinPoint Kotlin examples

This commit changes Any to Any? in ProceedingJoinPoint
Kotlin examples in order to be consistent with Java
and avoid a "NullPointerException: pjp.proceed() must
not be null" error.

Closes gh-31015
pull/31496/head
Sébastien Deleuze 3 years ago
parent
commit
0c15be004e
  1. 6
      framework-docs/modules/ROOT/pages/core/aop/schema.adoc
  2. 2
      framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc

6
framework-docs/modules/ROOT/pages/core/aop/schema.adoc

@ -435,7 +435,7 @@ Kotlin:: @@ -435,7 +435,7 @@ Kotlin::
+
[source,kotlin,indent=0,subs="verbatim",role="secondary"]
----
fun doBasicProfiling(pjp: ProceedingJoinPoint): Any {
fun doBasicProfiling(pjp: ProceedingJoinPoint): Any? {
// start stopwatch
val retVal = pjp.proceed()
// stop stopwatch
@ -554,7 +554,7 @@ Kotlin:: @@ -554,7 +554,7 @@ Kotlin::
class SimpleProfiler {
fun profile(call: ProceedingJoinPoint, name: String, age: Int): Any {
fun profile(call: ProceedingJoinPoint, name: String, age: Int): Any? {
val clock = StopWatch("Profiling for '$name' and '$age'")
try {
clock.start(call.toShortString())
@ -890,7 +890,7 @@ Kotlin:: @@ -890,7 +890,7 @@ Kotlin::
this.order = order
}
fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any {
fun doConcurrentOperation(pjp: ProceedingJoinPoint): Any? {
var numAttempts = 0
var lockFailureException: PessimisticLockingFailureException
do {

2
framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc

@ -493,7 +493,7 @@ Kotlin:: @@ -493,7 +493,7 @@ Kotlin::
class ProfilingAspect {
@Around("methodsToBeProfiled()")
fun profile(pjp: ProceedingJoinPoint): Any {
fun profile(pjp: ProceedingJoinPoint): Any? {
val sw = StopWatch(javaClass.simpleName)
try {
sw.start(pjp.getSignature().getName())

Loading…
Cancel
Save